BOOST_1.69 (#2547)

nanocurrency · Feb 11, 2020 · f28580d · f28580d
1 parent bd93581
commit f28580d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2,179 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,7 @@
 cmake_minimum_required (VERSION 3.4)
+
+cmake_policy(SET CMP0074 NEW)
+cmake_policy(SET CMP0077 NEW)
 # compatibility for osx sierra and on
 # needs to be set before project
 set (CMAKE_OSX_DEPLOYMENT_TARGET 10.12 CACHE STRING "")

diff --git a/ci/actions/windows/build.ps1 b/ci/actions/windows/build.ps1
@@ -31,6 +31,7 @@ if (${env:artifact} -eq 1) {
 
 mkdir build
 Push-Location build
+$env:BOOST_ROOT = ${env:BOOST_ROOT_1_69_0}
 
 & ..\ci\actions\windows\configure.bat
 if (${LastExitCode} -ne 0) {

diff --git a/ci/actions/windows/configure.bat b/ci/actions/windows/configure.bat
@@ -19,7 +19,9 @@ cmake .. ^
   -DCMAKE_BUILD_TYPE=%BUILD_TYPE% ^
   -DACTIVE_NETWORK=nano_%NETWORK_CFG%_network ^
   -DNANO_SIMD_OPTIMIZATIONS=TRUE ^
-  -Dgtest_force_shared_crt=on
+  -Dgtest_force_shared_crt=on ^
+  -DBoost_NO_SYSTEM_PATHS=TRUE ^
+  -DBoost_NO_BOOST_CMAKE=TRUE 
 
 set exit_code=%errorlevel%
 if %exit_code% neq 0 goto exit