123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869 |
- diff --git a/CMakeLists.txt b/CMakeLists.txt
- index 8df871cf7..2eafe3fde 100644
- --- a/CMakeLists.txt
- +++ b/CMakeLists.txt
- @@ -1,5 +1,5 @@
- PROJECT(yasm)
- -CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
- +CMAKE_MINIMUM_REQUIRED(VERSION 3.5)
- if (COMMAND cmake_policy)
- cmake_policy(SET CMP0003 NEW)
- endif (COMMAND cmake_policy)
- diff --git a/cmake/modules/YasmMacros.cmake b/cmake/modules/YasmMacros.cmake
- index ab1be00e9..e6006b31c 100644
- --- a/cmake/modules/YasmMacros.cmake
- +++ b/cmake/modules/YasmMacros.cmake
- @@ -58,31 +58,28 @@ macro (YASM_ADD_MODULE _module_NAME)
- endmacro (YASM_ADD_MODULE)
-
- macro (YASM_GENPERF _in_NAME _out_NAME)
- - get_target_property(_tmp_GENPERF_EXE genperf LOCATION)
- add_custom_command(
- OUTPUT ${_out_NAME}
- - COMMAND ${_tmp_GENPERF_EXE} ${_in_NAME} ${_out_NAME}
- - DEPENDS ${_tmp_GENPERF_EXE}
- + COMMAND $<TARGET_FILE:genperf> ${_in_NAME} ${_out_NAME}
- + DEPENDS genperf
- MAIN_DEPENDENCY ${_in_NAME}
- )
- endmacro (YASM_GENPERF)
-
- macro (YASM_RE2C _in_NAME _out_NAME)
- - get_target_property(_tmp_RE2C_EXE re2c LOCATION)
- add_custom_command(
- OUTPUT ${_out_NAME}
- - COMMAND ${_tmp_RE2C_EXE} ${ARGN} -o ${_out_NAME} ${_in_NAME}
- - DEPENDS ${_tmp_RE2C_EXE}
- + COMMAND $<TARGET_FILE:re2c> ${ARGN} -o ${_out_NAME} ${_in_NAME}
- + DEPENDS re2c
- MAIN_DEPENDENCY ${_in_NAME}
- )
- endmacro (YASM_RE2C)
-
- macro (YASM_GENMACRO _in_NAME _out_NAME _var_NAME)
- - get_target_property(_tmp_GENMACRO_EXE genmacro LOCATION)
- add_custom_command(
- OUTPUT ${_out_NAME}
- - COMMAND ${_tmp_GENMACRO_EXE} ${_out_NAME} ${_var_NAME} ${_in_NAME}
- - DEPENDS ${_tmp_GENMACRO_EXE}
- + COMMAND $<TARGET_FILE:genmacro> ${_out_NAME} ${_var_NAME} ${_in_NAME}
- + DEPENDS genmacro
- MAIN_DEPENDENCY ${_in_NAME}
- )
- endmacro (YASM_GENMACRO)
- diff --git a/modules/preprocs/nasm/CMakeLists.txt b/modules/preprocs/nasm/CMakeLists.txt
- index e10a9dd12..31e7a0345 100644
- --- a/modules/preprocs/nasm/CMakeLists.txt
- +++ b/modules/preprocs/nasm/CMakeLists.txt
- @@ -1,9 +1,8 @@
- add_executable(genversion preprocs/nasm/genversion.c)
- -get_target_property(_tmp_GENVERSION_EXE genversion LOCATION)
- add_custom_command(
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/version.mac
- - COMMAND ${_tmp_GENVERSION_EXE} ${CMAKE_CURRENT_BINARY_DIR}/version.mac
- - DEPENDS ${_tmp_GENVERSION_EXE}
- + COMMAND $<TARGET_FILE:genversion> ${CMAKE_CURRENT_BINARY_DIR}/version.mac
- + DEPENDS genversion
- )
-
- YASM_GENMACRO(
|