Fix incorrect CMake test directory when building as a subproject

This is an extension of e800985adbb0820c5692ea016b3a8499d69a73dc

diff --git a/cat/test/CMakeLists.txt b/cat/test/CMakeLists.txt
index ebb702ad8b22a0a30b8c4e84bc2c611e5668858a..bac00854c3a34cb62b749b9fd7f52e578b39f318 100644 (file)
--- a/cat/test/CMakeLists.txt
+++ b/cat/test/CMakeLists.txt
@@ -53,7 +53,7 @@ IF(ENABLE_CAT AND ENABLE_TEST)
 
   INCLUDE(${CMAKE_CURRENT_BINARY_DIR}/list.h)
   INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
-  INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/test_utils)
+  INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/test_utils)
 
   # Experimental new test handling
   ADD_CUSTOM_TARGET(run_bsdcat_test

diff --git a/cpio/test/CMakeLists.txt b/cpio/test/CMakeLists.txt
index d4f93bb0cad393c344fb63de0e7b6b24e4f951b8..ee900cdac33d57f2af8e3ac02068a2b2c6d51809 100644 (file)
--- a/cpio/test/CMakeLists.txt
+++ b/cpio/test/CMakeLists.txt
@@ -84,7 +84,7 @@ IF(ENABLE_CPIO AND ENABLE_TEST)
 
   INCLUDE(${CMAKE_CURRENT_BINARY_DIR}/list.h)
   INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
-  INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/test_utils)
+  INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/test_utils)
 
   # Experimental new test handling
   ADD_CUSTOM_TARGET(run_bsdcpio_test

diff --git a/tar/test/CMakeLists.txt b/tar/test/CMakeLists.txt
index f82ea5767435761fa4eabcf5ebf563434774e337..2f46727c83ca717ffa35f2d8ad6423ad209b451d 100644 (file)
--- a/tar/test/CMakeLists.txt
+++ b/tar/test/CMakeLists.txt
@@ -92,7 +92,7 @@ IF(ENABLE_TAR AND ENABLE_TEST)
 
   INCLUDE(${CMAKE_CURRENT_BINARY_DIR}/list.h)
   INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
-  INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/test_utils)
+  INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/test_utils)
 
   # Experimental new test handling
   ADD_CUSTOM_TARGET(run_bsdtar_test