diff options
| author | tamasmeszaros <meszaros.q@gmail.com> | 2019-12-11 15:51:16 +0300 |
|---|---|---|
| committer | tamasmeszaros <meszaros.q@gmail.com> | 2019-12-11 16:01:07 +0300 |
| commit | 4a4d8b4e26e5b5405cb44970e832e9d22bc58ec4 (patch) | |
| tree | 51052c8f4f1a842996e3e449941dfe591a9e9e93 /deps/deps-windows.cmake | |
| parent | c91046925a71f4e9333b36f99c07f37a6fe7cf74 (diff) | |
Fix zlib dependencies and CMAKE_MODULE_PATH forwarding
Diffstat (limited to 'deps/deps-windows.cmake')
| -rw-r--r-- | deps/deps-windows.cmake | 59 |
1 files changed, 30 insertions, 29 deletions
diff --git a/deps/deps-windows.cmake b/deps/deps-windows.cmake index 276129a8d..fc1823dc7 100644 --- a/deps/deps-windows.cmake +++ b/deps/deps-windows.cmake @@ -149,36 +149,37 @@ ExternalProject_Add(dep_nlopt add_debug_dep(dep_nlopt) -ExternalProject_Add(dep_zlib - EXCLUDE_FROM_ALL 1 - URL "https://zlib.net/zlib-1.2.11.tar.xz" - URL_HASH SHA256=4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066 - CMAKE_GENERATOR "${DEP_MSVC_GEN}" - CMAKE_GENERATOR_PLATFORM "${DEP_PLATFORM}" - CMAKE_ARGS - -DSKIP_INSTALL_FILES=ON # Prevent installation of man pages et al. - "-DINSTALL_BIN_DIR=${CMAKE_CURRENT_BINARY_DIR}\\fallout" # I found no better way of preventing zlib from creating & installing DLLs :-/ - -DCMAKE_POSITION_INDEPENDENT_CODE=ON - "-DCMAKE_INSTALL_PREFIX:PATH=${DESTDIR}\\usr\\local" - BUILD_COMMAND msbuild /m /P:Configuration=Release INSTALL.vcxproj - INSTALL_COMMAND "" -) +include(ZLIB/ZLIB.cmake) +# ExternalProject_Add(dep_zlib +# EXCLUDE_FROM_ALL 1 +# URL "https://zlib.net/zlib-1.2.11.tar.xz" +# URL_HASH SHA256=4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066 +# CMAKE_GENERATOR "${DEP_MSVC_GEN}" +# CMAKE_GENERATOR_PLATFORM "${DEP_PLATFORM}" +# CMAKE_ARGS +# -DSKIP_INSTALL_FILES=ON # Prevent installation of man pages et al. +# "-DINSTALL_BIN_DIR=${CMAKE_CURRENT_BINARY_DIR}\\fallout" # I found no better way of preventing zlib from creating & installing DLLs :-/ +# -DCMAKE_POSITION_INDEPENDENT_CODE=ON +# "-DCMAKE_INSTALL_PREFIX:PATH=${DESTDIR}\\usr\\local" +# BUILD_COMMAND msbuild /m /P:Configuration=Release INSTALL.vcxproj +# INSTALL_COMMAND "" +# ) -add_debug_dep(dep_zlib) +add_debug_dep(dep_ZLIB) # The following steps are unfortunately needed to remove the _static suffix on libraries -ExternalProject_Add_Step(dep_zlib fix_static - DEPENDEES install - COMMAND "${CMAKE_COMMAND}" -E rename zlibstatic.lib zlib.lib - WORKING_DIRECTORY "${DESTDIR}\\usr\\local\\lib\\" -) -if (${DEP_DEBUG}) - ExternalProject_Add_Step(dep_zlib fix_static_debug - DEPENDEES install - COMMAND "${CMAKE_COMMAND}" -E rename zlibstaticd.lib zlibd.lib - WORKING_DIRECTORY "${DESTDIR}\\usr\\local\\lib\\" - ) -endif () +# ExternalProject_Add_Step(dep_zlib fix_static +# DEPENDEES install +# COMMAND "${CMAKE_COMMAND}" -E rename zlibstatic.lib zlib.lib +# WORKING_DIRECTORY "${DESTDIR}\\usr\\local\\lib\\" +# ) +# if (${DEP_DEBUG}) +# ExternalProject_Add_Step(dep_zlib fix_static_debug +# DEPENDEES install +# COMMAND "${CMAKE_COMMAND}" -E rename zlibstaticd.lib zlibd.lib +# WORKING_DIRECTORY "${DESTDIR}\\usr\\local\\lib\\" +# ) +# endif () if (${DEPS_BITS} EQUAL 32) set(DEP_LIBCURL_TARGET "x86") @@ -273,7 +274,7 @@ ExternalProject_Add(dep_blosc #URL_HASH SHA256=7463a1df566704f212263312717ab2c36b45d45cba6cd0dccebf91b2cc4b4da9 GIT_REPOSITORY https://github.com/Blosc/c-blosc.git GIT_TAG e63775855294b50820ef44d1b157f4de1cc38d3e #v1.17.0 - DEPENDS dep_zlib + DEPENDS dep_ZLIB CMAKE_GENERATOR "${DEP_MSVC_GEN}" CMAKE_GENERATOR_PLATFORM "${DEP_PLATFORM}" CMAKE_ARGS @@ -300,7 +301,7 @@ ExternalProject_Add(dep_openexr EXCLUDE_FROM_ALL 1 GIT_REPOSITORY https://github.com/openexr/openexr.git GIT_TAG eae0e337c9f5117e78114fd05f7a415819df413a #v2.4.0 - DEPENDS dep_zlib + DEPENDS dep_ZLIB CMAKE_GENERATOR "${DEP_MSVC_GEN}" CMAKE_GENERATOR_PLATFORM "${DEP_PLATFORM}" CMAKE_ARGS |