diff options
| -rw-r--r-- | cat/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | cat/test/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | cpio/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | cpio/test/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | tar/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tar/test/CMakeLists.txt | 3 |
6 files changed, 6 insertions, 7 deletions
diff --git a/cat/CMakeLists.txt b/cat/CMakeLists.txt index 48bf0a63..4fe6354b 100644 --- a/cat/CMakeLists.txt +++ b/cat/CMakeLists.txt @@ -28,7 +28,6 @@ IF(ENABLE_CAT) SET_TARGET_PROPERTIES(bsdcat PROPERTIES COMPILE_DEFINITIONS LIBARCHIVE_STATIC) ENDIF(ENABLE_CAT_SHARED) - GET_TARGET_PROPERTY(BSDCAT bsdcat LOCATION) # Installation rules INSTALL(TARGETS bsdcat RUNTIME DESTINATION bin) diff --git a/cat/test/CMakeLists.txt b/cat/test/CMakeLists.txt index bac00854..0990bcf2 100644 --- a/cat/test/CMakeLists.txt +++ b/cat/test/CMakeLists.txt @@ -57,7 +57,8 @@ IF(ENABLE_CAT AND ENABLE_TEST) # Experimental new test handling ADD_CUSTOM_TARGET(run_bsdcat_test - COMMAND bsdcat_test -p ${BSDCAT} -r ${CMAKE_CURRENT_SOURCE_DIR}) + COMMAND bsdcat_test -p $<TARGET_FILE:bsdcat> + -r ${CMAKE_CURRENT_SOURCE_DIR}) ADD_DEPENDENCIES(run_bsdcat_test bsdcat) ADD_DEPENDENCIES(run_all_tests run_bsdcat_test) diff --git a/cpio/CMakeLists.txt b/cpio/CMakeLists.txt index 44309971..85fda778 100644 --- a/cpio/CMakeLists.txt +++ b/cpio/CMakeLists.txt @@ -37,8 +37,6 @@ IF(ENABLE_CPIO) SET_TARGET_PROPERTIES(bsdcpio PROPERTIES COMPILE_DEFINITIONS LIBARCHIVE_STATIC) ENDIF(ENABLE_CPIO_SHARED) - # Full path to the compiled executable (used by test suite) - GET_TARGET_PROPERTY(BSDCPIO bsdcpio LOCATION) # Installation rules INSTALL(TARGETS bsdcpio RUNTIME DESTINATION bin) diff --git a/cpio/test/CMakeLists.txt b/cpio/test/CMakeLists.txt index af502b13..f2c27540 100644 --- a/cpio/test/CMakeLists.txt +++ b/cpio/test/CMakeLists.txt @@ -89,7 +89,8 @@ IF(ENABLE_CPIO AND ENABLE_TEST) # Experimental new test handling ADD_CUSTOM_TARGET(run_bsdcpio_test - COMMAND bsdcpio_test -p ${BSDCPIO} -r ${CMAKE_CURRENT_SOURCE_DIR}) + COMMAND bsdcpio_test -p $<TARGET_FILE:bsdcpio> + -r ${CMAKE_CURRENT_SOURCE_DIR}) ADD_DEPENDENCIES(run_bsdcpio_test bsdcpio) ADD_DEPENDENCIES(run_all_tests run_bsdcpio_test) ENDIF(ENABLE_CPIO AND ENABLE_TEST) diff --git a/tar/CMakeLists.txt b/tar/CMakeLists.txt index a449ed40..6434791f 100644 --- a/tar/CMakeLists.txt +++ b/tar/CMakeLists.txt @@ -41,7 +41,6 @@ IF(ENABLE_TAR) SET_TARGET_PROPERTIES(bsdtar PROPERTIES COMPILE_DEFINITIONS LIBARCHIVE_STATIC) ENDIF(ENABLE_TAR_SHARED) - GET_TARGET_PROPERTY(BSDTAR bsdtar LOCATION) # Installation rules INSTALL(TARGETS bsdtar RUNTIME DESTINATION bin) diff --git a/tar/test/CMakeLists.txt b/tar/test/CMakeLists.txt index 5e3e243a..ade72ea7 100644 --- a/tar/test/CMakeLists.txt +++ b/tar/test/CMakeLists.txt @@ -97,7 +97,8 @@ IF(ENABLE_TAR AND ENABLE_TEST) # Experimental new test handling ADD_CUSTOM_TARGET(run_bsdtar_test - COMMAND bsdtar_test -p ${BSDTAR} -r ${CMAKE_CURRENT_SOURCE_DIR}) + COMMAND bsdtar_test -p $<TARGET_FILE:bsdtar> + -r ${CMAKE_CURRENT_SOURCE_DIR}) ADD_DEPENDENCIES(run_bsdtar_test bsdtar) ADD_DEPENDENCIES(run_all_tests run_bsdtar_test) |