diff options
-rw-r--r-- | cpio/CMakeLists.txt | 1 | ||||
-rw-r--r-- | libarchive/test/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tar/test/CMakeLists.txt | 7 |
3 files changed, 6 insertions, 4 deletions
diff --git a/cpio/CMakeLists.txt b/cpio/CMakeLists.txt index cc4aa14c..135d0893 100644 --- 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 d74206d8..56d80890 100644 --- 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 98f49e29..45dfe68f 100644 --- 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 |