Skip to content

Commit 6170a89

Browse files
committed
oh got fooled by my local cache, keep ZLIB_INCLUDE_DIR and ZLIB_LIBRARY to trick find_package calls
1 parent 8453c88 commit 6170a89

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

3rdparty/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,13 +88,15 @@ set(ZLIB_INSTALL OFF)
8888
set(ZLIB_BUILD_TESTING OFF)
8989
set(ZLIB_BUILD_MINIZIP OFF)
9090
add_subdirectory(zlib zlib EXCLUDE_FROM_ALL)
91-
add_library(ZLIB::ZLIB ALIAS zlibstatic) # trick projects which want to use it
9291
get_target_property(ZLIB_BINARY_DIR zlibstatic "BINARY_DIR")
9392
set_target_properties(zlibstatic PROPERTIES
9493
ARCHIVE_OUTPUT_DIRECTORY $<1:${ZLIB_BINARY_DIR}>
9594
DEBUG_POSTFIX "d"
9695
OUTPUT_NAME zlibstatic
9796
)
97+
add_library(ZLIB::ZLIB ALIAS zlibstatic) # trick projects which want to use it via alias
98+
set(ZLIB_INCLUDE_DIR "${THIRD_PARTY_SOURCE_DIR}/zlib;${THIRD_PARTY_BINARY_DIR}/zlib" CACHE INTERNAL "" FORCE) # and
99+
set(ZLIB_LIBRARY zlibstatic CACHE INTERNAL "" FORCE) # find_package
98100

99101
set(SPIRV_HEADERS_SKIP_INSTALL ON CACHE INTERNAL "Skip SPIRV-Headers install")
100102
set(SPIRV_HEADERS_SKIP_EXAMPLES ON CACHE INTERNAL "Skip SPIRV-Headers examples")

0 commit comments

Comments
 (0)