From 51924a70ef57dd4a3abf849bc3c17e3efd5cb224 Mon Sep 17 00:00:00 2001 From: Maru Date: Wed, 6 Jun 2018 15:20:23 -0300 Subject: [PATCH] fix boost static lib cmake find --- CMakeLists.txt | 8 +++++++- CMakeSettings.json | 8 ++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 010d0e07..40562bb2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,13 @@ set( LIBRARY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/libraries" ) ########################################################################## # Dependencies and compiler settings -#include( "cmake/boost.cmake" ) + +if( NOT SAPPHIRE_BOOST_VER ) + set( SAPPHIRE_BOOST_VER 1.63.0 ) +endif() +set( SAPPHIRE_BOOST_FOLDER_NAME boost_1_63_0 ) + +include( "cmake/boost.cmake" ) #include( "cmake/mysql.cmake" ) include( "cmake/compiler.cmake" ) include( "cmake/cotire.cmake" ) diff --git a/CMakeSettings.json b/CMakeSettings.json index 90e895cd..963bcfd9 100644 --- a/CMakeSettings.json +++ b/CMakeSettings.json @@ -67,7 +67,7 @@ "variables": [ { "name": "Boost_COMPILER", - "value": "-vc141" + "value": "-vc140" } ] }, @@ -81,7 +81,7 @@ "variables": [ { "name": "Boost_COMPILER", - "value": "-vc141" + "value": "-vc140" } ] }, @@ -95,7 +95,7 @@ "variables": [ { "name": "Boost_COMPILER", - "value": "-vc141" + "value": "-vc140" } ] }, @@ -109,7 +109,7 @@ "variables": [ { "name": "Boost_COMPILER", - "value": "-vc141" + "value": "-vc140" } ] }