From c1186340d22439121c5023b8586cbce71ec545a4 Mon Sep 17 00:00:00 2001 From: tamasmeszaros Date: Mon, 25 Mar 2019 14:06:28 +0100 Subject: [PATCH] Fix for missing dep_zlib on in deps scripts --- deps/CMakeLists.txt | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt index 0fe9697ad..a77f8b4a0 100644 --- a/deps/CMakeLists.txt +++ b/deps/CMakeLists.txt @@ -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).