diff options
| author | Sefa Eyeoglu <contact@scrumplex.net> | 2022-11-23 09:49:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-23 09:49:24 +0100 |
| commit | e6cb6cae116477814280a90bbcd70dce0b9fa388 (patch) | |
| tree | b8fad4cec06bdf52dffdb18ca19804895b99d3cf | |
| parent | 68b7aa0a4d124b231ba351ae8d37ea6c55b333a2 (diff) | |
| parent | 980f03dd206d9e15ceb111839ebc615a493c790f (diff) | |
| download | PrismLauncher-e6cb6cae116477814280a90bbcd70dce0b9fa388.tar.gz PrismLauncher-e6cb6cae116477814280a90bbcd70dce0b9fa388.tar.bz2 PrismLauncher-e6cb6cae116477814280a90bbcd70dce0b9fa388.zip | |
Merge pull request #508 from TheLastRar/ForceBundledLibs
| -rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8fc0d326..f04b733b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -368,11 +368,11 @@ if(NOT ZLIB_FOUND) set(SKIP_INSTALL_ALL ON) add_subdirectory(libraries/zlib EXCLUDE_FROM_ALL) - set(ZLIB_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries/zlib" "${CMAKE_CURRENT_BINARY_DIR}/libraries/zlib") + set(ZLIB_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries/zlib" "${CMAKE_CURRENT_BINARY_DIR}/libraries/zlib" CACHE STRING "") set_target_properties(zlibstatic PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${ZLIB_INCLUDE_DIR}") add_library(ZLIB::ZLIB ALIAS zlibstatic) - set(ZLIB_LIBRARY ZLIB::ZLIB) - set(ZLIB_FOUND true) + set(ZLIB_LIBRARY ZLIB::ZLIB CACHE STRING "zlib library name") + find_package(ZLIB REQUIRED) else() message(STATUS "Using system zlib") |