Skip to content

Commit 93a0d6a

Browse files
committed
Merge pull request #57 from paoloambrosio/master
Forced minimum Boost version for VS2012 as by issue #56
2 parents 757fe11 + e41a9b7 commit 93a0d6a

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

CMakeLists.txt

+10-2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,14 @@ endif()
2727
# Boost
2828
#
2929

30+
if(MSVC11)
31+
# Boost 1.51 fixed a bug with MSVC11
32+
message(STATUS "Forcing Boost 1.51+ on MSVC11")
33+
set(BOOST_MIN_VERSION "1.51")
34+
else()
35+
set(BOOST_MIN_VERSION "1.40")
36+
endif()
37+
3038
set(CUKE_CORE_BOOST_LIBS thread system regex date_time)
3139
if(NOT CUKE_DISABLE_BOOST_TEST)
3240
set(CUKE_TEST_BOOST_LIBS unit_test_framework)
@@ -49,12 +57,12 @@ endif()
4957

5058
if(CUKE_STATIC_BOOST_LIBS)
5159
set(Boost_USE_STATIC_LIBS ON)
52-
find_package(Boost COMPONENTS ${CUKE_STATIC_BOOST_LIBS})
60+
find_package(Boost ${BOOST_MIN_VERSION} COMPONENTS ${CUKE_STATIC_BOOST_LIBS})
5361
endif()
5462

5563
if(CUKE_DYNAMIC_BOOST_LIBS)
5664
set(Boost_USE_STATIC_LIBS OFF)
57-
find_package(Boost COMPONENTS ${CUKE_DYNAMIC_BOOST_LIBS})
65+
find_package(Boost ${BOOST_MIN_VERSION} COMPONENTS ${CUKE_DYNAMIC_BOOST_LIBS})
5866
endif()
5967

6068
if(Boost_FOUND)

0 commit comments

Comments
 (0)