3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-31 12:41:20 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

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

Browse source
This commit is contained in:
bubnikv 2018-10-31 18:05:41 +01:00
commit 8cab0a9757
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
deps/CMakeLists.txt vendored
View file

@ -48,7 +48,14 @@ else ()
endif() endif()
add_custom_target(deps ALL 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 # Note: I'm not using any of the LOG_xxx options in ExternalProject_Add() commands

1
deps/deps-unix-static.cmake vendored
View file

@ -63,7 +63,6 @@ ExternalProject_Add(dep_zlib
INSTALL_COMMAND "" INSTALL_COMMAND ""
) )
ExternalProject_Add(dep_libpng ExternalProject_Add(dep_libpng
DEPENDS dep_zlib DEPENDS dep_zlib
EXCLUDE_FROM_ALL 1 EXCLUDE_FROM_ALL 1