Merge branch 'dev_native' of https://github.com/prusa3d/Slic3r into dev_native

2018-10-31 18:05:41 +01:00 · 2018-10-31 18:05:41 +01:00 · 8cab0a9757
commit 8cab0a9757
parent 75c097010d 0984c9a111
2 changed files with 8 additions and 2 deletions
--- a/deps/CMakeLists.txt
+++ b/deps/CMakeLists.txt
@ -48,7 +48,14 @@ else ()
 endif()

 add_custom_target(deps ALL
-    DEPENDS dep_boost dep_tbb dep_libcurl dep_wxwidgets
+    DEPENDS
+        dep_boost
+        dep_tbb
+        dep_libcurl
+        dep_wxwidgets
+        dep_gtest
+        dep_nlopt
+        dep_libpng
 )

 # Note: I'm not using any of the LOG_xxx options in ExternalProject_Add() commands
--- a/deps/deps-unix-static.cmake
+++ b/deps/deps-unix-static.cmake
@ -63,7 +63,6 @@ ExternalProject_Add(dep_zlib
    INSTALL_COMMAND ""
 )

-
 ExternalProject_Add(dep_libpng
    DEPENDS dep_zlib
    EXCLUDE_FROM_ALL 1