upd-min-cmake.diff 2.5 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869
  1. diff --git a/CMakeLists.txt b/CMakeLists.txt
  2. index 8df871cf7..2eafe3fde 100644
  3. --- a/CMakeLists.txt
  4. +++ b/CMakeLists.txt
  5. @@ -1,5 +1,5 @@
  6. PROJECT(yasm)
  7. -CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
  8. +CMAKE_MINIMUM_REQUIRED(VERSION 3.5)
  9. if (COMMAND cmake_policy)
  10. cmake_policy(SET CMP0003 NEW)
  11. endif (COMMAND cmake_policy)
  12. diff --git a/cmake/modules/YasmMacros.cmake b/cmake/modules/YasmMacros.cmake
  13. index ab1be00e9..e6006b31c 100644
  14. --- a/cmake/modules/YasmMacros.cmake
  15. +++ b/cmake/modules/YasmMacros.cmake
  16. @@ -58,31 +58,28 @@ macro (YASM_ADD_MODULE _module_NAME)
  17. endmacro (YASM_ADD_MODULE)
  18. macro (YASM_GENPERF _in_NAME _out_NAME)
  19. - get_target_property(_tmp_GENPERF_EXE genperf LOCATION)
  20. add_custom_command(
  21. OUTPUT ${_out_NAME}
  22. - COMMAND ${_tmp_GENPERF_EXE} ${_in_NAME} ${_out_NAME}
  23. - DEPENDS ${_tmp_GENPERF_EXE}
  24. + COMMAND $<TARGET_FILE:genperf> ${_in_NAME} ${_out_NAME}
  25. + DEPENDS genperf
  26. MAIN_DEPENDENCY ${_in_NAME}
  27. )
  28. endmacro (YASM_GENPERF)
  29. macro (YASM_RE2C _in_NAME _out_NAME)
  30. - get_target_property(_tmp_RE2C_EXE re2c LOCATION)
  31. add_custom_command(
  32. OUTPUT ${_out_NAME}
  33. - COMMAND ${_tmp_RE2C_EXE} ${ARGN} -o ${_out_NAME} ${_in_NAME}
  34. - DEPENDS ${_tmp_RE2C_EXE}
  35. + COMMAND $<TARGET_FILE:re2c> ${ARGN} -o ${_out_NAME} ${_in_NAME}
  36. + DEPENDS re2c
  37. MAIN_DEPENDENCY ${_in_NAME}
  38. )
  39. endmacro (YASM_RE2C)
  40. macro (YASM_GENMACRO _in_NAME _out_NAME _var_NAME)
  41. - get_target_property(_tmp_GENMACRO_EXE genmacro LOCATION)
  42. add_custom_command(
  43. OUTPUT ${_out_NAME}
  44. - COMMAND ${_tmp_GENMACRO_EXE} ${_out_NAME} ${_var_NAME} ${_in_NAME}
  45. - DEPENDS ${_tmp_GENMACRO_EXE}
  46. + COMMAND $<TARGET_FILE:genmacro> ${_out_NAME} ${_var_NAME} ${_in_NAME}
  47. + DEPENDS genmacro
  48. MAIN_DEPENDENCY ${_in_NAME}
  49. )
  50. endmacro (YASM_GENMACRO)
  51. diff --git a/modules/preprocs/nasm/CMakeLists.txt b/modules/preprocs/nasm/CMakeLists.txt
  52. index e10a9dd12..31e7a0345 100644
  53. --- a/modules/preprocs/nasm/CMakeLists.txt
  54. +++ b/modules/preprocs/nasm/CMakeLists.txt
  55. @@ -1,9 +1,8 @@
  56. add_executable(genversion preprocs/nasm/genversion.c)
  57. -get_target_property(_tmp_GENVERSION_EXE genversion LOCATION)
  58. add_custom_command(
  59. OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/version.mac
  60. - COMMAND ${_tmp_GENVERSION_EXE} ${CMAKE_CURRENT_BINARY_DIR}/version.mac
  61. - DEPENDS ${_tmp_GENVERSION_EXE}
  62. + COMMAND $<TARGET_FILE:genversion> ${CMAKE_CURRENT_BINARY_DIR}/version.mac
  63. + DEPENDS genversion
  64. )
  65. YASM_GENMACRO(