]> git.ipfire.org Git - thirdparty/libarchive.git/commitdiff
Avoid CMake Warning that used GET_TARGET_PROPERTY with LOCATION property,
authorMichihiro NAKAJIMA <ggcueroad@gmail.com>
Mon, 13 Oct 2014 12:55:56 +0000 (21:55 +0900)
committerMichihiro NAKAJIMA <ggcueroad@gmail.com>
Mon, 13 Oct 2014 13:02:39 +0000 (22:02 +0900)
so we should use $<TARGET_FILE> expression instead.

cat/CMakeLists.txt
cat/test/CMakeLists.txt
cpio/CMakeLists.txt
cpio/test/CMakeLists.txt
tar/CMakeLists.txt
tar/test/CMakeLists.txt

index 48bf0a63d060ebd87c388ee6936462eacffe5976..4fe6354b3131e98be25a01386a094a01f7a8b4ec 100644 (file)
@@ -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)
index bac00854c3a34cb62b749b9fd7f52e578b39f318..0990bcf272a7caa1e9663e22f6a182dc5c654b3e 100644 (file)
@@ -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)
 
index 4430997193af228e042637040af965497a2a1dab..85fda7782800c5c5bc226427f5608d25e0228b2d 100644 (file)
@@ -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)
index af502b13d226c8a019b4bb0930fd88348e71e46d..f2c27540813d1afe60b6e10557e8583aba9a5efe 100644 (file)
@@ -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)
index a449ed405c976e88610faae88f3781e3ff270159..6434791f788f58e6a18d4efcba727fbe68a11801 100644 (file)
@@ -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)
index 5e3e243afe95e1a316bcf26b0f77354fb7655705..ade72ea7c602783b160ea1808a90d788199b7687 100644 (file)
@@ -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)