From 2b65de60e806560b367b5ed0e230aaea9d90b312 Mon Sep 17 00:00:00 2001
From: Tristan Walter <twalter@orn.mpg.de>
Date: Sat, 10 Oct 2020 13:30:48 +0200
Subject: [PATCH] include in all
---
Application/CMakeLists.txt | 25 ++++++++++++++++---------
1 file changed, 16 insertions(+), 9 deletions(-)
diff --git a/Application/CMakeLists.txt b/Application/CMakeLists.txt
index 23af8ab..8edc6cd 100644
--- a/Application/CMakeLists.txt
+++ b/Application/CMakeLists.txt
@@ -576,16 +576,23 @@ if(NOT TREX_BUILD_ZIP)
endif()
endif()
-
-if(WIN32)
- if(TREX_BUILD_ZLIB)
- set(trex_subproject_CMAKE_ARGS ${trex_subproject_CMAKE_ARGS}
- -DCMAKE_PREFIX_PATH=${zlib_install_dir}/lib/zlib.lib
+if(TREX_BUILD_ZLIB)
+ if(WIN32)
+ set(trex_subproject_CMAKE_ARGS ${trex_subproject_CMAKE_ARGS}
+ -DCMAKE_PREFIX_PATH=${zlib_install_dir}/lib/zlib.lib
-DZLIB_LIBRARY:FILEPATH=${zlib_install_dir}/lib/zlib.lib
- -DZLIB_LIBRARY_RELEASE:FILEPATH=${zlib_install_dir}/lib/zlib.lib
- -DZLIB_LIBRARY_RELWITHDEBINFO:FILEPATH=${zlib_install_dir}/lib/zlib.lib
- -DZLIB_LIBRARY_DEBUG:FILEPATH=${zlib_install_dir}/lib/zlibd.lib)
- endif()
+ -DZLIB_LIBRARY_RELEASE:FILEPATH=${zlib_install_dir}/lib/zlib.lib
+ -DZLIB_LIBRARY_RELWITHDEBINFO:FILEPATH=${zlib_install_dir}/lib/zlib.lib
+ -DZLIB_LIBRARY_DEBUG:FILEPATH=${zlib_install_dir}/lib/zlibd.lib)
+
+ else()
+ set(trex_subproject_CMAKE_ARGS ${trex_subproject_CMAKE_ARGS}
+ -DZLIB_INCLUDE_DIR:PATH=${zlib_install_dir}/include
+ -DZLIB_LIBRARY_RELEASE:FILEPATH=${zlib_install_dir}/lib/libz.a
+ -DZLIB_LIBRARY_RELWITHDEBINFO:FILEPATH=${zlib_install_dir}/lib/libz.a
+ -DZLIB_LIBRARY_DEBUG:FILEPATH=${zlib_install_dir}/lib/libzd.a
+ )
+ endif()
endif()
if(TREX_BUILD_ZIP)
--
GitLab