From c62d30e5fa4339bc0b0ebfaeea3ed21a0a874a8e Mon Sep 17 00:00:00 2001
From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Mon, 13 Oct 2014 21:55:56 +0900
Subject: [PATCH] Avoid CMake Warning that used GET_TARGET_PROPERTY with
 LOCATION property, so we should use $<TARGET_FILE> expression instead.

---
 cat/CMakeLists.txt       | 1 -
 cat/test/CMakeLists.txt  | 3 ++-
 cpio/CMakeLists.txt      | 2 --
 cpio/test/CMakeLists.txt | 3 ++-
 tar/CMakeLists.txt       | 1 -
 tar/test/CMakeLists.txt  | 3 ++-
 6 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/cat/CMakeLists.txt b/cat/CMakeLists.txt
index 48bf0a63d..4fe6354b3 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 bac00854c..0990bcf27 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 443099719..85fda7782 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 af502b13d..f2c275408 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 a449ed405..6434791f7 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 5e3e243af..ade72ea7c 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)
 
-- 
2.47.2