Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed boost unittests test

This commit is contained in:
Frank Celler 2016-02-24 23:43:07 +01:00
parent 554cf0594a
commit cb6f4c024b
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -387,18 +387,20 @@ endif ()
option(USE_BOOST_SYSTEM_LIBS "use libraries provided by the system" OFF) option(USE_BOOST_SYSTEM_LIBS "use libraries provided by the system" OFF)
set(Boost_USE_MULTITHREADED ON)
set(BOOST_MINIMUM_VERSION 1.58) set(BOOST_MINIMUM_VERSION 1.58)
set(Boost_USE_MULTITHREADED ON)
if (USE_BOOST_SYSTEM_LIBS) if (USE_BOOST_SYSTEM_LIBS)
find(Boost ${BOOST_MINIMUM_VERSION} REQUIRED) find_package(Boost ${BOOST_MINIMUM_VERSION} REQUIRED)
else () else ()
set(BOOST_INCLUDE ${PROJECT_SOURCE_DIR}/3rdParty/boost/${BOOST_MINIMUM_VERSION}.0 CACHE path "BOOST include path") set(BOOST_INCLUDE ${PROJECT_SOURCE_DIR}/3rdParty/boost/${BOOST_MINIMUM_VERSION}.0 CACHE path "BOOST include path")
set(Boost_INCLUDE_DIR ${BOOST_INCLUDE}) set(Boost_INCLUDE_DIR ${BOOST_INCLUDE})
set(Boost_VERSION ${BOOST_MINIMUM_VERSION}) set(Boost_VERSION ${BOOST_MINIMUM_VERSION})
find_package(Boost ${BOOST_MINIMUM_VERSION} REQUIRED)
endif () endif ()
find_package(Boost ${Boost_VERSION} EXACT COMPONENTS unit_test_framework) find_package(Boost ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION} EXACT COMPONENTS unit_test_framework)
if (${Boost_UNIT_TEST_FRAMEWORK_FOUND}) if (${Boost_UNIT_TEST_FRAMEWORK_FOUND})
try_compile( try_compile(
@ -425,8 +427,6 @@ if (NOT USE_BOOST_UNITTESTS)
message("BOOST unit tests are disabled") message("BOOST unit tests are disabled")
endif () endif ()
find_package(Boost ${BOOST_MINIMUM_VERSION} REQUIRED)
include_directories(${Boost_INCLUDE_DIR}) include_directories(${Boost_INCLUDE_DIR})
set(BOOST_VERSION set(BOOST_VERSION

2
cmake/test_boost.cpp
View File

@ -1,3 +1,5 @@
#define BOOST_TEST_DYN_LINK
#define BOOST_TEST_MODULE "link test"
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
struct TestSetup { struct TestSetup {