Browse Source

deps: fix ZLIB being built after its needed

tamasmeszaros 4 years ago
parent
commit
55e4b48642
2 changed files with 4 additions and 5 deletions
  1. 3 0
      deps/CMakeLists.txt
  2. 1 5
      deps/deps-windows.cmake

+ 3 - 0
deps/CMakeLists.txt

@@ -152,6 +152,9 @@ include(MPFR/MPFR.cmake)
 include(CGAL/CGAL.cmake)
 include(CGAL/CGAL.cmake)
 include(wxWidgets/wxWidgets.cmake)
 include(wxWidgets/wxWidgets.cmake)
 
 
+add_dependencies(dep_blosc ${ZLIB_PKG})
+add_dependencies(dep_openexr ${ZLIB_PKG})
+
 if (MSVC)
 if (MSVC)
 
 
     add_custom_target(deps ALL
     add_custom_target(deps ALL

+ 1 - 5
deps/deps-windows.cmake

@@ -35,8 +35,6 @@ else ()
     set(DEP_PLATFORM "x64")
     set(DEP_PLATFORM "x64")
 endif ()
 endif ()
 
 
-
-
 if (${DEP_DEBUG})
 if (${DEP_DEBUG})
     set(DEP_BOOST_DEBUG "debug")
     set(DEP_BOOST_DEBUG "debug")
 else ()
 else ()
@@ -217,7 +215,6 @@ ExternalProject_Add(dep_blosc
     #URL_HASH SHA256=7463a1df566704f212263312717ab2c36b45d45cba6cd0dccebf91b2cc4b4da9
     #URL_HASH SHA256=7463a1df566704f212263312717ab2c36b45d45cba6cd0dccebf91b2cc4b4da9
     GIT_REPOSITORY https://github.com/Blosc/c-blosc.git
     GIT_REPOSITORY https://github.com/Blosc/c-blosc.git
     GIT_TAG e63775855294b50820ef44d1b157f4de1cc38d3e #v1.17.0
     GIT_TAG e63775855294b50820ef44d1b157f4de1cc38d3e #v1.17.0
-    DEPENDS ${ZLIB_PKG}
     CMAKE_GENERATOR "${DEP_MSVC_GEN}"
     CMAKE_GENERATOR "${DEP_MSVC_GEN}"
     CMAKE_GENERATOR_PLATFORM "${DEP_PLATFORM}"
     CMAKE_GENERATOR_PLATFORM "${DEP_PLATFORM}"
     CMAKE_ARGS
     CMAKE_ARGS
@@ -243,8 +240,7 @@ add_debug_dep(dep_blosc)
 ExternalProject_Add(dep_openexr
 ExternalProject_Add(dep_openexr
     EXCLUDE_FROM_ALL 1
     EXCLUDE_FROM_ALL 1
     GIT_REPOSITORY https://github.com/openexr/openexr.git
     GIT_REPOSITORY https://github.com/openexr/openexr.git
-    GIT_TAG eae0e337c9f5117e78114fd05f7a415819df413a #v2.4.0 
-    DEPENDS ${ZLIB_PKG}
+    GIT_TAG eae0e337c9f5117e78114fd05f7a415819df413a #v2.4.0
     CMAKE_GENERATOR "${DEP_MSVC_GEN}"
     CMAKE_GENERATOR "${DEP_MSVC_GEN}"
     CMAKE_GENERATOR_PLATFORM "${DEP_PLATFORM}"
     CMAKE_GENERATOR_PLATFORM "${DEP_PLATFORM}"
     CMAKE_ARGS
     CMAKE_ARGS