diff options
| author | Vojtech Kral <vojtech@kral.hk> | 2018-10-16 10:20:56 +0300 |
|---|---|---|
| committer | Vojtech Kral <vojtech@kral.hk> | 2018-10-16 12:55:46 +0300 |
| commit | 0263769d8f5462523cbf32899be5d4e4f3629ea1 (patch) | |
| tree | 74b8ad6a417f3b93eb9c1821377f30229cd0ff59 /deps | |
| parent | 059ab4a05c42dd47b621200f6a737c5534c02877 (diff) | |
deps: Back to Boost 1.63 on Windows as newer ones require newer CMake
32bit deps fix
Diffstat (limited to 'deps')
| -rw-r--r-- | deps/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | deps/deps-windows.cmake | 4 |
2 files changed, 8 insertions, 6 deletions
diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt index a20c7aa18..72df1a2fc 100644 --- a/deps/CMakeLists.txt +++ b/deps/CMakeLists.txt @@ -13,13 +13,15 @@ if (MSVC) set(DEPS_BITS 64) set(DESTDIR "${CMAKE_CURRENT_BINARY_DIR}/destdir-64") 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(DESTDIR "${CMAKE_CURRENT_BINARY_DIR}/destdir-32") include("deps-windows.cmake") - - add_custom_target(deps ALL - 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 + add_custom_target(deps_32 + DEPENDS dep_boost_32 dep_tbb_32 dep_libcurl_32 dep_wxwidgets_32 ) else () set(DESTDIR "${CMAKE_CURRENT_BINARY_DIR}/destdir") diff --git a/deps/deps-windows.cmake b/deps/deps-windows.cmake index eaf5b8e65..8a276c54e 100644 --- a/deps/deps-windows.cmake +++ b/deps/deps-windows.cmake @@ -1,8 +1,8 @@ ExternalProject_Add("dep_boost_${DEPS_BITS}" EXCLUDE_FROM_ALL 1 - URL "https://dl.bintray.com/boostorg/release/1.66.0/source/boost_1_66_0.tar.gz" - URL_HASH SHA256=bd0df411efd9a585e5a2212275f8762079fed8842264954675a4fddc46cfcf60 + URL "https://dl.bintray.com/boostorg/release/1.63.0/source/boost_1_63_0.tar.gz" + URL_HASH SHA256=fe34a4e119798e10b8cc9e565b3b0284e9fd3977ec8a1b19586ad1dec397088b BUILD_IN_SOURCE 1 CONFIGURE_COMMAND bootstrap.bat BUILD_COMMAND b2.exe |