Fix cmake test builds when building as a sub-project

diff --git a/cpio/CMakeLists.txt b/cpio/CMakeLists.txt
index cc4aa14cb54bc2143ce0ee88f1b055be7e356f1c..135d0893b40a179f2e2648217720fd3e48dbddb3 100644 (file)
--- a/cpio/CMakeLists.txt
+++ b/cpio/CMakeLists.txt
@@ -16,6 +16,7 @@ IF(ENABLE_CPIO)
     ../libarchive_fe/line_reader.c
     ../libarchive_fe/line_reader.h
   )
+  INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/test_utils)
   INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../libarchive_fe)
   IF(WIN32 AND NOT CYGWIN)
     LIST(APPEND bsdcpio_SOURCES cpio_windows.c)

diff --git a/libarchive/test/CMakeLists.txt b/libarchive/test/CMakeLists.txt
index d74206d8933076fb88798f9f8b4779fbf9e868b0..56d80890e9490e1940c9f03134837111a548385a 100644 (file)
--- a/libarchive/test/CMakeLists.txt
+++ b/libarchive/test/CMakeLists.txt
@@ -248,7 +248,7 @@ IF(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_libarchive_test

diff --git a/tar/test/CMakeLists.txt b/tar/test/CMakeLists.txt
index 98f49e29298b638189e07231c72259de97bb43db..45dfe68ffe158e0899c3f5e435ee194d249bc6f4 100644 (file)
--- a/tar/test/CMakeLists.txt
+++ b/tar/test/CMakeLists.txt
@@ -62,6 +62,10 @@ IF(ENABLE_TAR AND ENABLE_TEST)
     test_windows.c
   )
 
+  INCLUDE(${CMAKE_CURRENT_BINARY_DIR}/list.h)
+  INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+  INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/test_utils)
+
   #
   # Register target
   #
@@ -88,9 +92,6 @@ IF(ENABLE_TAR AND ENABLE_TEST)
                           ${_testname})
   ENDMACRO (DEFINE_TEST _testname)
 
-  INCLUDE(${CMAKE_CURRENT_BINARY_DIR}/list.h)
-  INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
-  INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/test_utils)
 
   # Experimental new test handling
   ADD_CUSTOM_TARGET(run_bsdtar_test