Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk

3rdParty/CMakeLists.txt

@@ -47,12 +47,6 @@ if (WINDOWS)
   add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/regex)
 endif ()
 
-################################################################################
-## BOOST
-################################################################################
-
-add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/boost)
-
 ################################################################################
 ## EV
 ################################################################################

CMakeLists.txt

@@ -211,6 +211,7 @@ endif ()
 # need c++11
 set(CMAKE_CXX_STANDARD 11)
 include(CheckCXX11Features)
+include(Boost)
 
 # need threads
 find_package(Threads REQUIRED)
@@ -597,8 +598,8 @@ endif ()
 ## BOOST
 ################################################################################
 
-include_directories(${BOOST_INCLUDE_DIR})
-add_definitions(-DARANGODB_BOOST_VERSION=\"${BOOST_VERSION}\")
+include_directories(${Boost_INCLUDE_DIR})
+add_definitions(-DARANGODB_BOOST_VERSION=\"${Boost_VERSION}\")
 
 ################################################################################
 ## ICU
@@ -732,7 +733,9 @@ list(INSERT SYSTEM_LIBRARIES 0
 add_subdirectory(lib)
 add_subdirectory(arangosh)
 add_subdirectory(arangod)
-add_subdirectory(UnitTests)
+if (USE_BOOST_UNITTESTS)
+  add_subdirectory(UnitTests)
+endif()
 add_subdirectory(Documentation)
 
 add_dependencies(arangob zlibstatic v8_build)

UnitTests/CMakeLists.txt

@@ -3,72 +3,74 @@
 include_directories(.)
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/tests/")
+find_package(Boost ${BOOST_MINIMUM_VERSION} REQUIRED COMPONENTS unit_test_framework)
 
 ################################################################################
 ## basics_suite
 ################################################################################
 
-if (USE_BOOST_UNITTESTS)
-  add_executable(${TEST_BASICS_SUITE}
-    Basics/Runner.cpp
-    Basics/conversions-test.cpp
-    Basics/csv-test.cpp
-    Basics/files-test.cpp
-    Basics/fpconv-test.cpp
-    Basics/json-test.cpp
-    Basics/json-utilities-test.cpp
-    Basics/hashes-test.cpp
-    Basics/associative-multi-pointer-test.cpp
-    Basics/associative-multi-pointer-nohashcache-test.cpp
-    Basics/skiplist-test.cpp
-    Basics/priorityqueue-test.cpp
-    Basics/string-buffer-test.cpp
-    Basics/string-utf8-normalize-test.cpp
-    Basics/string-utf8-test.cpp
-    Basics/string-test.cpp
-    Basics/structure-size-test.cpp
-    Basics/vector-pointer-test.cpp
-    Basics/vector-test.cpp
-    Basics/EndpointTest.cpp
-    Basics/StringBufferTest.cpp
-    Basics/StringUtilsTest.cpp
-    ../lib/Basics/WorkMonitorDummy.cpp
-  )
+add_executable(${TEST_BASICS_SUITE}
+  Basics/Runner.cpp
+  Basics/conversions-test.cpp
+  Basics/csv-test.cpp
+  Basics/files-test.cpp
+  Basics/fpconv-test.cpp
+  Basics/json-test.cpp
+  Basics/json-utilities-test.cpp
+  Basics/hashes-test.cpp
+  Basics/associative-multi-pointer-test.cpp
+  Basics/associative-multi-pointer-nohashcache-test.cpp
+  Basics/skiplist-test.cpp
+  Basics/priorityqueue-test.cpp
+  Basics/string-buffer-test.cpp
+  Basics/string-utf8-normalize-test.cpp
+  Basics/string-utf8-test.cpp
+  Basics/string-test.cpp
+  Basics/structure-size-test.cpp
+  Basics/vector-pointer-test.cpp
+  Basics/vector-test.cpp
+  Basics/EndpointTest.cpp
+  Basics/StringBufferTest.cpp
+  Basics/StringUtilsTest.cpp
+  ../lib/Basics/WorkMonitorDummy.cpp
+)
 
-  target_link_libraries(${TEST_BASICS_SUITE}
-    ${LIB_ARANGO}
-    ${BOOST_LIBS}
-    ${SYSTEM_LIBRARIES}
-  )
+target_include_directories(
+  ${TEST_BASICS_SUITE}
+  PUBLIC ${Boost_UNIT_TEST_INCLUDE_DIR}
+)
 
-  if (NOT USE_PRECOMPILED_V8)
-    add_dependencies(basics_suite v8_build)
-  else ()
-    add_dependencies(basics_suite)
-  endif ()
+target_link_libraries(${TEST_BASICS_SUITE}
+  ${LIB_ARANGO}
+  ${SYSTEM_LIBRARIES}
+  ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}
+)
+
+if (NOT USE_PRECOMPILED_V8)
+  add_dependencies(basics_suite v8_build)
+else ()
+  add_dependencies(basics_suite)
 endif ()
 
 ################################################################################
 ## geo_suite
 ################################################################################
 
-if (USE_BOOST_UNITTESTS)
-  add_executable(${TEST_GEO_SUITE}
-    Geo/Runner.cpp
-    Geo/georeg.cpp
-    ../lib/Basics/WorkMonitorDummy.cpp
-    ../arangod/GeoIndex/GeoIndex.cpp
-  )
+add_executable(${TEST_GEO_SUITE}
+  Geo/Runner.cpp
+  Geo/georeg.cpp
+  ../lib/Basics/WorkMonitorDummy.cpp
+  ../arangod/GeoIndex/GeoIndex.cpp
+)
 
-  target_link_libraries(${TEST_GEO_SUITE}
-    ${LIB_ARANGO}
-    ${BOOST_LIBS}
-    ${SYSTEM_LIBRARIES}
-  )
+target_link_libraries(${TEST_GEO_SUITE}
+  ${LIB_ARANGO}
+  ${SYSTEM_LIBRARIES}
+  ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}
+)
 
-  if (NOT USE_PRECOMPILED_V8)
-    add_dependencies(geo_suite v8_build)
-  else ()
-    add_dependencies(geo_suite)
-  endif ()
+if (NOT USE_PRECOMPILED_V8)
+  add_dependencies(geo_suite v8_build)
+else ()
+  add_dependencies(geo_suite)
 endif ()

cmake/Boost.cmake

@@ -11,16 +11,13 @@ cmake_minimum_required(VERSION 2.6)
 option(USE_SYSTEM_BOOST "use libraries provided by the system" OFF)
 
 set(BOOST_MINIMUM_VERSION 1.58)
-
-set(Boost_USE_MULTITHREADED ON)
-
 if (USE_SYSTEM_BOOST)
-  find_package(Boost ${BOOST_MINIMUM_VERSION} REQUIRED COMPONENTS unit_test_framework)
-else ()
-  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_VERSION ${BOOST_MINIMUM_VERSION})
   find_package(Boost ${BOOST_MINIMUM_VERSION} REQUIRED)
+  FIND_PACKAGE(Boost COMPONENTS unit_test_framework)
+  set(Boost_USE_MULTITHREADED ON)
+else ()
+  set(Boost_VERSION "${BOOST_MINIMUM_VERSION}")
+  set(Boost_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/3rdParty/boost/${BOOST_MINIMUM_VERSION}.0")
 endif ()
 
 if (Boost_UNIT_TEST_FRAMEWORK_FOUND)
@@ -47,22 +44,3 @@ endif ()
 if (NOT USE_BOOST_UNITTESTS)
   message(STATUS "BOOST unit-tests are disabled")
 endif ()
-
-set(BOOST_VERSION
-  "${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}"
-  CACHE INTERNAL
-  "Boost: Version"
-  FORCE
-)
-
-set(BOOST_INCLUDE_DIR
-  "${Boost_INCLUDE_DIR}"
-  CACHE INTERNAL
-  "Boost: Include Directory"
-)
-
-set(BOOST_LIBS
-  "${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}"
-  CACHE INTERNAL
-  "Boost: Libraries"
-)