splitted into 3rd libs

3rdParty/CMakeLists.txt

@@ -45,6 +45,12 @@ add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/boost)
 
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/libev)
 
+################################################################################
+## OPENSSL
+################################################################################
+
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/openssl)
+
 ################################################################################
 ## V8 and ICU
 ################################################################################

3rdParty/OpenSSL/CMakeLists.txt

@@ -0,0 +1,30 @@
+# -*- mode: CMAKE; -*-
+
+# ------------------------------------------------------------------------------
+# OPENSSL
+# ------------------------------------------------------------------------------
+
+find_package(OpenSSL REQUIRED)
+
+if (OPENSSL_VERSION)
+  string(REPLACE "." ";" OPENSSL_VERSION_LIST ${OPENSSL_VERSION})
+  list(GET OPENSSL_VERSION_LIST 0 OPENSSL_VERSION_MAJOR)
+  list(GET OPENSSL_VERSION_LIST 1 OPENSSL_VERSION_MINOR)
+  if (${OPENSSL_VERSION_MAJOR} GREATER 0 AND ${OPENSSL_VERSION_MINOR} GREATER 0)
+    add_definitions(-DOPENSSL_NO_SSL2)
+  endif ()
+endif ()
+
+set(OPENSSL_VERSION
+  "${OPENSSL_VERSION}"
+  CACHE INTERNAL
+  "OpenSSL: Version"
+  FORCE
+)
+
+set(OPENSSL_INCLUDE_DIR
+  "${OPENSSL_INCLUDE_DIR}"
+  CACHE INTERNAL
+  "OpenSSL: Include Directory"
+  FORCE
+)

3rdParty/boost/CMakeLists.txt

@@ -0,0 +1,72 @@
+cmake_minimum_required(VERSION 2.6)
+
+# ------------------------------------------------------------------------------
+# V8 / ICU
+# ------------------------------------------------------------------------------
+
+################################################################################
+## BOOST
+################################################################################
+
+option(USE_BOOST_SYSTEM_LIBS "use libraries provided by the system" OFF)
+
+set(BOOST_MINIMUM_VERSION 1.58)
+
+set(Boost_USE_MULTITHREADED ON)
+
+if (USE_BOOST_SYSTEM_LIBS)
+  find_package(Boost ${BOOST_MINIMUM_VERSION} REQUIRED)
+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)
+endif ()
+
+find_package(Boost ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION} EXACT COMPONENTS unit_test_framework)
+
+if (${Boost_UNIT_TEST_FRAMEWORK_FOUND} STREQUAL "ON")
+  try_compile(
+    HAVE_USABLE_BOOT_LIBRARIES
+      "${CMAKE_BINARY_DIR}/temp"
+      "${CMAKE_SOURCE_DIR}/cmake/test_boost.cpp"
+    LINK_LIBRARIES
+      ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}
+    CMAKE_FLAGS
+      "-DINCLUDE_DIRECTORIES=${Boost_INCLUDE_DIR}"
+  )
+
+  if (HAVE_USABLE_BOOT_LIBRARIES)
+    option(USE_BOOST_UNITTESTS "use boost unit-tests" ON)
+  else ()
+    message("cannot use BOOST library ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}")
+    option(USE_BOOST_UNITTESTS "use boost unit-tests" OFF)
+  endif ()
+else ()
+  option(USE_BOOST_UNITTESTS "use boost unit-tests" OFF)
+endif ()
+
+if (NOT USE_BOOST_UNITTESTS)
+  message("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"
+  FORCE
+)
+
+set(BOOST_LIBS
+  "${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}"
+  CACHE INTERNAL
+  "Boost: Libraries"
+  FORCE
+)

CMakeLists.txt

@@ -326,8 +326,9 @@ endif ()
 
 include(VcMacros)
 
-include(OptimizeForArchitecture)
-OptimizeForArchitecture()
+# we do not want to build specialized packages for one architecture
+# include(OptimizeForArchitecture)
+# OptimizeForArchitecture()
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Vc_ARCHITECTURE_FLAGS}")
 
@@ -378,22 +379,6 @@ if (USE_FAILURE_TESTS)
   add_definitions("-DARANGODB_ENABLE_FAILURE_TESTS=1")
 endif ()
 
-################################################################################
-## OPENSSL
-################################################################################
-
-find_package(OpenSSL REQUIRED)
-include_directories(${OPENSSL_INCLUDE_DIR})
-
-if (OPENSSL_VERSION)
-  string(REPLACE "." ";" OPENSSL_VERSION_LIST ${OPENSSL_VERSION})
-  list(GET OPENSSL_VERSION_LIST 0 OPENSSL_VERSION_MAJOR)
-  list(GET OPENSSL_VERSION_LIST 1 OPENSSL_VERSION_MINOR)
-  if (${OPENSSL_VERSION_MAJOR} GREATER 0 AND ${OPENSSL_VERSION_MINOR} GREATER 0)
-    add_definitions(-DOPENSSL_NO_SSL2)
-  endif ()				
-endif ()
-
 ################################################################################
 ## TCMALLOC
 ################################################################################
@@ -456,6 +441,13 @@ include_directories(${ICU_INCLUDE_DIR})
 include_directories(${LIBEV_INCLUDE_DIR})
 add_definitions("-DARANGODB_LIBEV_VERSION=\"${LIBEV_VERSION}\"")
 
+################################################################################
+## OPENSSL
+################################################################################
+
+include_directories(${OPENSSL_INCLUDE_DIR})
+add_definitions(-DARANGODB_OPENSSL_VERSION=\"${BOOST_VERSION}\")
+
 ################################################################################
 ## V8
 ################################################################################

lib/Rest/Version.cpp

@@ -154,6 +154,8 @@ std::string Version::getV8Version() {
 std::string Version::getOpenSSLVersion() {
 #ifdef OPENSSL_VERSION_TEXT
   return std::string(OPENSSL_VERSION_TEXT);
+#elif ARANGODB_OPENSSL_VERSION
+  return std::string(ARANGODB_OPENSSL_VERSION);
 #else
   return std::string("");
 #endif