Fix for missing dep_zlib on in deps scripts
This commit is contained in:
parent
27b7e7c6a9
commit
c1186340d2
1 changed files with 19 additions and 2 deletions
21
deps/CMakeLists.txt
vendored
21
deps/CMakeLists.txt
vendored
|
@ -74,7 +74,9 @@ else ()
|
|||
include("deps-linux.cmake")
|
||||
endif()
|
||||
|
||||
add_custom_target(deps ALL
|
||||
if (MSVC)
|
||||
|
||||
add_custom_target(deps ALL
|
||||
DEPENDS
|
||||
dep_boost
|
||||
dep_tbb
|
||||
|
@ -82,7 +84,22 @@ add_custom_target(deps ALL
|
|||
dep_wxwidgets
|
||||
dep_gtest
|
||||
dep_nlopt
|
||||
)
|
||||
dep_zlib # on Windows we still need zlib
|
||||
)
|
||||
|
||||
else()
|
||||
|
||||
add_custom_target(deps ALL
|
||||
DEPENDS
|
||||
dep_boost
|
||||
dep_tbb
|
||||
dep_libcurl
|
||||
dep_wxwidgets
|
||||
dep_gtest
|
||||
dep_nlopt
|
||||
)
|
||||
|
||||
endif()
|
||||
|
||||
# Note: I'm not using any of the LOG_xxx options in ExternalProject_Add() commands
|
||||
# because they seem to generate bogus build files (possibly a bug in ExternalProject).
|
||||
|
|
Loading…
Reference in a new issue