amd/orcaslicer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix for missing dep_zlib on in deps scripts

Browse source
This commit is contained in:
tamasmeszaros 2019-03-25 14:06:28 +01:00
parent 27b7e7c6a9
commit c1186340d2
1 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
deps/CMakeLists.txt vendored
View file

@ -74,7 +74,9 @@ else ()
include("deps-linux.cmake") include("deps-linux.cmake")
endif() endif()
add_custom_target(deps ALL if (MSVC)
add_custom_target(deps ALL
DEPENDS DEPENDS
dep_boost dep_boost
dep_tbb dep_tbb
@ -82,7 +84,22 @@ add_custom_target(deps ALL
dep_wxwidgets dep_wxwidgets
dep_gtest dep_gtest
dep_nlopt 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 # 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). # because they seem to generate bogus build files (possibly a bug in ExternalProject).