From: Vladislav Shchapov <vladislav@shchapov.ru>
Date: Wed, 17 Aug 2022 13:13:39 +0000 (+0500)
Subject: Fix build as subproject.
X-Git-Tag: 2.1.0-beta1~175
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=facce4981c60ef178cf0d718f7a606627eb4d2f3;p=thirdparty%2Fzlib-ng.git

Fix build as subproject.

Signed-off-by: Vladislav Shchapov <vladislav@shchapov.ru>
---

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 29658422a..51d1cf084 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 3.5.1)
 
 macro(configure_test_executable target)
-    target_include_directories(${target} PRIVATE ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR})
-    set_target_properties(${target} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
+    target_include_directories(${target} PRIVATE ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR})
+    set_target_properties(${target} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
     if(NOT WITH_GZFILEOP)
         target_compile_definitions(${target} PRIVATE -DWITH_GZFILEOP)
         target_sources(${target} PRIVATE ${ZLIB_GZFILE_PRIVATE_HDRS} ${ZLIB_GZFILE_SRCS})
@@ -49,19 +49,19 @@ add_executable(infcover infcover.c)
 configure_test_executable(infcover)
 target_link_libraries(infcover zlib)
 if(NOT DEFINED BUILD_SHARED_LIBS OR BUILD_SHARED_LIBS)
-    target_sources(infcover PRIVATE ${CMAKE_SOURCE_DIR}/inftrees.c)
+    target_sources(infcover PRIVATE ${PROJECT_SOURCE_DIR}/inftrees.c)
 endif()
 add_test(NAME infcover COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:infcover>)
 
-add_executable(makefixed ${CMAKE_SOURCE_DIR}/tools/makefixed.c ${CMAKE_SOURCE_DIR}/inftrees.c)
+add_executable(makefixed ${PROJECT_SOURCE_DIR}/tools/makefixed.c ${PROJECT_SOURCE_DIR}/inftrees.c)
 configure_test_executable(makefixed)
 set(MAKEFIXED_COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:makefixed>)
 
-add_executable(maketrees ${CMAKE_SOURCE_DIR}/tools/maketrees.c ${CMAKE_SOURCE_DIR}/trees.c ${CMAKE_SOURCE_DIR}/zutil.c)
+add_executable(maketrees ${PROJECT_SOURCE_DIR}/tools/maketrees.c ${PROJECT_SOURCE_DIR}/trees.c ${PROJECT_SOURCE_DIR}/zutil.c)
 configure_test_executable(maketrees)
 set(MAKETREES_COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:maketrees>)
 
-add_executable(makecrct ${CMAKE_SOURCE_DIR}/tools/makecrct.c)
+add_executable(makecrct ${PROJECT_SOURCE_DIR}/tools/makecrct.c)
 configure_test_executable(makecrct)
 set(MAKECRCT_COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:makecrct>)
 
diff --git a/test/benchmarks/CMakeLists.txt b/test/benchmarks/CMakeLists.txt
index e6eaa352b..bfd4b081a 100644
--- a/test/benchmarks/CMakeLists.txt
+++ b/test/benchmarks/CMakeLists.txt
@@ -32,8 +32,8 @@ add_executable(benchmark_zlib
     )
 
 target_include_directories(benchmark_zlib PRIVATE
-    ${CMAKE_SOURCE_DIR}
-    ${CMAKE_BINARY_DIR}
+    ${PROJECT_SOURCE_DIR}
+    ${PROJECT_BINARY_DIR}
     ${benchmark_SOURCE_DIR}/benchmark/include)
 
 target_link_libraries(benchmark_zlib zlibstatic benchmark::benchmark)
@@ -77,15 +77,15 @@ if(WITH_BENCHMARK_APPS)
         target_link_libraries(benchmark_zlib_apps_alt libpng.a ${ZLIB_ALT_LIB} benchmark::benchmark)
         target_compile_definitions(benchmark_zlib_apps_alt PRIVATE BUILD_ALT=1)
         target_include_directories(benchmark_zlib_apps_alt PRIVATE
-            ${CMAKE_SOURCE_DIR}
-            ${CMAKE_BINARY_DIR}
+            ${PROJECT_SOURCE_DIR}
+            ${PROJECT_BINARY_DIR}
             ${PNG_INCLUDE_DIR}
             ${benchmark_SOURCE_DIR}/benchmark/include)
     endif()
 
     target_include_directories(benchmark_zlib_apps PRIVATE
-        ${CMAKE_SOURCE_DIR}
-        ${CMAKE_BINARY_DIR}
+        ${PROJECT_SOURCE_DIR}
+        ${PROJECT_BINARY_DIR}
         ${PNG_INCLUDE_DIR}
         ${benchmark_SOURCE_DIR}/benchmark/include)
 
diff --git a/test/cmake/test-tools.cmake b/test/cmake/test-tools.cmake
index ce9a3ff2c..afe4835d8 100644
--- a/test/cmake/test-tools.cmake
+++ b/test/cmake/test-tools.cmake
@@ -37,8 +37,8 @@ add_test(NAME switchlevels-help
 add_test(NAME makecrct
     COMMAND ${CMAKE_COMMAND}
     "-DCOMMAND=${MAKECRCT_COMMAND}"
-    -DOUTPUT=${CMAKE_BINARY_DIR}/Testing/Temporary/crc32_braid_tbl._h
-    -DCOMPARE=${CMAKE_SOURCE_DIR}/crc32_braid_tbl.h
+    -DOUTPUT=${PROJECT_BINARY_DIR}/Testing/Temporary/crc32_braid_tbl._h
+    -DCOMPARE=${PROJECT_SOURCE_DIR}/crc32_braid_tbl.h
     -DIGNORE_LINE_ENDINGS=ON
     -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/run-and-compare.cmake)
 
@@ -46,8 +46,8 @@ add_test(NAME makecrct
 add_test(NAME makefixed
     COMMAND ${CMAKE_COMMAND}
     "-DCOMMAND=${MAKEFIXED_COMMAND}"
-    -DOUTPUT=${CMAKE_BINARY_DIR}/Testing/Temporary/inffixed_tbl._h
-    -DCOMPARE=${CMAKE_SOURCE_DIR}/inffixed_tbl.h
+    -DOUTPUT=${PROJECT_BINARY_DIR}/Testing/Temporary/inffixed_tbl._h
+    -DCOMPARE=${PROJECT_SOURCE_DIR}/inffixed_tbl.h
     -DIGNORE_LINE_ENDINGS=ON
     -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/run-and-compare.cmake)
 
@@ -55,7 +55,7 @@ add_test(NAME makefixed
 add_test(NAME maketrees
     COMMAND ${CMAKE_COMMAND}
     "-DCOMMAND=${MAKETREES_COMMAND}"
-    -DOUTPUT=${CMAKE_BINARY_DIR}/Testing/Temporary/trees_tbl._h
-    -DCOMPARE=${CMAKE_SOURCE_DIR}/trees_tbl.h
+    -DOUTPUT=${PROJECT_BINARY_DIR}/Testing/Temporary/trees_tbl._h
+    -DCOMPARE=${PROJECT_SOURCE_DIR}/trees_tbl.h
     -DIGNORE_LINE_ENDINGS=ON
     -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/run-and-compare.cmake)
diff --git a/test/fuzz/CMakeLists.txt b/test/fuzz/CMakeLists.txt
index c21f9c1ca..9f1463742 100644
--- a/test/fuzz/CMakeLists.txt
+++ b/test/fuzz/CMakeLists.txt
@@ -37,7 +37,7 @@ foreach(FUZZER ${FUZZERS})
     endif()
 
     if(ZLIB_ENABLE_TESTS)
-        file(GLOB FUZZER_TEST_FILES ${CMAKE_SOURCE_DIR}/*)
+        file(GLOB FUZZER_TEST_FILES ${PROJECT_SOURCE_DIR}/*)
         set(FUZZER_COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:${FUZZER}> ${FUZZER_TEST_FILES})
         add_test(NAME ${FUZZER} COMMAND ${FUZZER_COMMAND})
     endif()