3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

deps: Back to Boost 1.63 on Windows as newer ones require newer CMake

Browse Source 
32bit deps fix
This commit is contained in:
Vojtech Kral 2018-10-16 09:20:56 +02:00
parent 059ab4a05c
commit 0263769d8f
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
deps/CMakeLists.txt vendored
View File

@ -13,13 +13,15 @@ if (MSVC)
set(DEPS_BITS 64) set(DEPS_BITS 64)
set(DESTDIR "${CMAKE_CURRENT_BINARY_DIR}/destdir-64") set(DESTDIR "${CMAKE_CURRENT_BINARY_DIR}/destdir-64")
include("deps-windows.cmake") include("deps-windows.cmake")
add_custom_target(deps_64
DEPENDS dep_boost_64 dep_tbb_64 dep_libcurl_64 dep_wxwidgets_64
)
set(DEPS_BITS 32) set(DEPS_BITS 32)
set(DESTDIR "${CMAKE_CURRENT_BINARY_DIR}/destdir-32") set(DESTDIR "${CMAKE_CURRENT_BINARY_DIR}/destdir-32")
include("deps-windows.cmake") include("deps-windows.cmake")
add_custom_target(deps_32
add_custom_target(deps ALL DEPENDS dep_boost_32 dep_tbb_32 dep_libcurl_32 dep_wxwidgets_32
DEPENDS dep_boost_64 dep_tbb_64 dep_libcurl_64 dep_wxwidgets_64
# dep_boost_32 dep_tbb_32 dep_libcurl_32 dep_wxwidgets_32
) )
else () else ()
set(DESTDIR "${CMAKE_CURRENT_BINARY_DIR}/destdir") set(DESTDIR "${CMAKE_CURRENT_BINARY_DIR}/destdir")

4
deps/deps-windows.cmake vendored
View File

@ -1,8 +1,8 @@
ExternalProject_Add("dep_boost_${DEPS_BITS}" ExternalProject_Add("dep_boost_${DEPS_BITS}"
EXCLUDE_FROM_ALL 1 EXCLUDE_FROM_ALL 1
URL "https://dl.bintray.com/boostorg/release/1.66.0/source/boost_1_66_0.tar.gz" URL "https://dl.bintray.com/boostorg/release/1.63.0/source/boost_1_63_0.tar.gz"
URL_HASH SHA256=bd0df411efd9a585e5a2212275f8762079fed8842264954675a4fddc46cfcf60 URL_HASH SHA256=fe34a4e119798e10b8cc9e565b3b0284e9fd3977ec8a1b19586ad1dec397088b
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
CONFIGURE_COMMAND bootstrap.bat CONFIGURE_COMMAND bootstrap.bat
BUILD_COMMAND b2.exe BUILD_COMMAND b2.exe