mirror of https://gitee.com/bigwinds/arangodb
Try openssl 1.1 (#5123)
This commit is contained in:
Max Neunhöffer
Jan
parent
93099c7c05
commit
7bed3f2df0
|
|
@ -89,9 +89,10 @@ if (USE_PRECOMPILED_V8)
|
||||||
FORCE
|
FORCE
|
||||||
)
|
)
|
||||||
else ()
|
else ()
|
||||||
if (MSVC AND USE_IRESEARCH)
|
# meaningless IResearch circus that makes the windows build fail
|
||||||
set(V8_TARGET_ARCHS "Debug;Release") # need to build both ICU for IResearch otherwise no library to link with
|
#if (MSVC AND USE_IRESEARCH)
|
||||||
endif ()
|
# set(V8_TARGET_ARCHS "Debug;Release") # need to build both ICU for IResearch otherwise no library to link with
|
||||||
|
#endif ()
|
||||||
|
|
||||||
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/V8)
|
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/V8)
|
||||||
set(ICU_DT "${ICU_DT}" PARENT_SCOPE)
|
set(ICU_DT "${ICU_DT}" PARENT_SCOPE)
|
||||||
|
|
|
||||||
|
|
@ -129,16 +129,23 @@ if (WIN32 AND ${CMAKE_GENERATOR} MATCHES "Ninja")
|
||||||
message(STATUS "using generator NINJA on Windows! Still WIP be patient!")
|
message(STATUS "using generator NINJA on Windows! Still WIP be patient!")
|
||||||
set(GYP_MAIN ${V8_DIR}/gypfiles/gyp_v8)
|
set(GYP_MAIN ${V8_DIR}/gypfiles/gyp_v8)
|
||||||
|
|
||||||
# try to find 2013 in 'Visual Studio 12 2013 Win64'
|
if (${CMAKE_GENERATOR} MATCHES "2013")
|
||||||
#if (${CMAKE_GENERATOR} MATCHES "2013")
|
# try to find 2013 in 'Visual Studio 12 2013 Win64'
|
||||||
# list(APPEND V8_GYP_ARGS "-G msvs_version=2013")
|
set(GYP_MSVS_VERSION "2013")
|
||||||
#endif()
|
MESSAGE(STATUS "setting GYP_MSVS_VERSION to 2013")
|
||||||
|
elseif (${CMAKE_GENERATOR} MATCHES "2015")
|
||||||
# try to find 2015 in 'Visual Studio 14 2015 Win64'
|
# try to find 2015 in 'Visual Studio 14 2015 Win64'
|
||||||
#if (${CMAKE_GENERATOR} MATCHES "2015")
|
set(GYP_MSVS_VERSION "2015")
|
||||||
# list(APPEND V8_GYP_ARGS "-G msvs_version=2015")
|
MESSAGE(STATUS "setting GYP_MSVS_VERSION to 2015")
|
||||||
|
elseif (${CMAKE_GENERATOR} MATCHES "2017")
|
||||||
|
# try to find 2017 in 'Visual Studio 15 2017 Win64'
|
||||||
|
set(GYP_MSVS_VERSION "2017")
|
||||||
|
MESSAGE(STATUS "setting GYP_MSVS_VERSION to 2017")
|
||||||
|
else ()
|
||||||
|
set(GYP_MSVS_VERSION "2017")
|
||||||
|
MESSAGE(STATUS "setting GYP_MSVS_VERSION to 2017 by default")
|
||||||
|
endif()
|
||||||
list(APPEND V8_GYP_ARGS --format ninja)
|
list(APPEND V8_GYP_ARGS --format ninja)
|
||||||
#endif()
|
|
||||||
|
|
||||||
if ("${BITS}" STREQUAL "64")
|
if ("${BITS}" STREQUAL "64")
|
||||||
set(MS_TARGET_PLATFORM x64)
|
set(MS_TARGET_PLATFORM x64)
|
||||||
|
|
@ -149,9 +156,12 @@ if (WIN32 AND ${CMAKE_GENERATOR} MATCHES "Ninja")
|
||||||
list(APPEND V8_GYP_ARGS -Dtarget_arch=${V8_PROC_ARCH} -Dhost_arch=${V8_PROC_ARCH})
|
list(APPEND V8_GYP_ARGS -Dtarget_arch=${V8_PROC_ARCH} -Dhost_arch=${V8_PROC_ARCH})
|
||||||
list(APPEND V8_GYP_ARGS ${V8_DIR}/gypfiles/all.gyp)
|
list(APPEND V8_GYP_ARGS ${V8_DIR}/gypfiles/all.gyp)
|
||||||
|
|
||||||
if ("${V8_TARGET_ARCHS}" STREQUAL "")
|
set(GYP_GENERATORS "msvs")
|
||||||
set(V8_TARGET_ARCHS "Debug;Release" CACHE string "V8 targets to build")
|
set(DEPOT_TOOLS_WIN_TOOLCHAIN "0")
|
||||||
endif()
|
set(GYP_MSVS_OVERRIDE_PATH "${CMAKE_CXX_COMPILER}")
|
||||||
|
|
||||||
|
list(APPEND V8_TARGET_ARCHS "Debug" "Release")
|
||||||
|
|
||||||
list(APPEND V8_GYP_ARGS
|
list(APPEND V8_GYP_ARGS
|
||||||
-Dcomponent=static_library
|
-Dcomponent=static_library
|
||||||
-Dlibrary=static_library
|
-Dlibrary=static_library
|
||||||
|
|
@ -172,7 +182,7 @@ if (WIN32 AND ${CMAKE_GENERATOR} MATCHES "Ninja")
|
||||||
SOURCE_DIR
|
SOURCE_DIR
|
||||||
"${V8_DIR}"
|
"${V8_DIR}"
|
||||||
CONFIGURE_COMMAND
|
CONFIGURE_COMMAND
|
||||||
${PYTHON_EXECUTABLE} ${GYP_MAIN} ${V8_GYP_ARGS}
|
env GYP_MSVS_VERSION=${GYP_MSVS_VERSION} GYP_MSVS_OVERRIDE_PATH=${GYP_MSVS_OVERRIDE_PATH} DEPOT_TOOLS_WIN_TOOLCHAIN=${DEPOT_TOOLS_WIN_TOOLCHAIN} ${PYTHON_EXECUTABLE} ${GYP_MAIN} ${V8_GYP_ARGS}
|
||||||
BINARY_DIR
|
BINARY_DIR
|
||||||
${NINJA_BUILD_DIR}
|
${NINJA_BUILD_DIR}
|
||||||
BUILD_COMMAND
|
BUILD_COMMAND
|
||||||
|
|
@ -290,20 +300,26 @@ elseif (WIN32)
|
||||||
MESSAGE(STATUS "Building V8 for Windows with MSBUILD")
|
MESSAGE(STATUS "Building V8 for Windows with MSBUILD")
|
||||||
set(GYP_MAIN gypfiles/gyp_v8)
|
set(GYP_MAIN gypfiles/gyp_v8)
|
||||||
|
|
||||||
# try to find 2013 in 'Visual Studio 12 2013 Win64'
|
if (${CMAKE_GENERATOR} MATCHES "2013")
|
||||||
if (${CMAKE_GENERATOR} MATCHES "2013")
|
# try to find 2013 in 'Visual Studio 12 2013 Win64'
|
||||||
list(APPEND V8_GYP_ARGS "-Gmsvs_version=2013")
|
set(GYP_MSVS_VERSION "2013")
|
||||||
|
MESSAGE(STATUS "setting GYP_MSVS_VERSION to 2013")
|
||||||
|
elseif (${CMAKE_GENERATOR} MATCHES "2015")
|
||||||
|
# try to find 2015 in 'Visual Studio 14 2015 Win64'
|
||||||
|
set(GYP_MSVS_VERSION "2015")
|
||||||
|
MESSAGE(STATUS "setting GYP_MSVS_VERSION to 2015")
|
||||||
|
elseif (${CMAKE_GENERATOR} MATCHES "2017")
|
||||||
|
# try to find 2017 in 'Visual Studio 15 2017 Win64'
|
||||||
|
set(GYP_MSVS_VERSION "2017")
|
||||||
|
MESSAGE(STATUS "setting GYP_MSVS_VERSION to 2017")
|
||||||
|
else ()
|
||||||
|
set(GYP_MSVS_VERSION "2017")
|
||||||
|
MESSAGE(STATUS "setting GYP_MSVS_VERSION to 2017 by default")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# try to find 2015 in 'Visual Studio 14 2015 Win64'
|
|
||||||
if (${CMAKE_GENERATOR} MATCHES "2015")
|
|
||||||
list(APPEND V8_GYP_ARGS "-Gmsvs_version=2015")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
list(APPEND V8_GYP_ARGS "-GGYP_GENERATORS=msvs")
|
|
||||||
list(APPEND V8_GYP_ARGS "-Dmsvs_cygwin_shell=0")
|
list(APPEND V8_GYP_ARGS "-Dmsvs_cygwin_shell=0")
|
||||||
list(APPEND V8_GYP_ARGS "-Dv8_use_snapshot=false")
|
list(APPEND V8_GYP_ARGS "-Dv8_use_snapshot=false")
|
||||||
|
|
||||||
if ("${BITS}" STREQUAL "64")
|
if ("${BITS}" STREQUAL "64")
|
||||||
set(MS_TARGET_PLATFORM x64)
|
set(MS_TARGET_PLATFORM x64)
|
||||||
else ()
|
else ()
|
||||||
|
|
@ -313,12 +329,11 @@ elseif (WIN32)
|
||||||
list(APPEND V8_GYP_ARGS -Dtarget_arch=${V8_PROC_ARCH} -Dhost_arch=${V8_PROC_ARCH})
|
list(APPEND V8_GYP_ARGS -Dtarget_arch=${V8_PROC_ARCH} -Dhost_arch=${V8_PROC_ARCH})
|
||||||
list(APPEND V8_GYP_ARGS gypfiles/all.gyp)
|
list(APPEND V8_GYP_ARGS gypfiles/all.gyp)
|
||||||
|
|
||||||
if ("${V8_TARGET_ARCHS}" STREQUAL "")
|
list(APPEND V8_TARGET_ARCHS "Debug" "Release")
|
||||||
set(V8_TARGET_ARCHS "Debug;Release" CACHE string "V8 targets to build")
|
set(GYP_GENERATORS "msvs")
|
||||||
endif()
|
set(DEPOT_TOOLS_WIN_TOOLCHAIN "0")
|
||||||
set(ENV{GYP_GENERATORS} msvs)
|
set(GYP_MSVS_OVERRIDE_PATH "${CMAKE_CXX_COMPILER}")
|
||||||
set(ENV{GYP_MSVS_VERSION} 2015)
|
|
||||||
set(ENV{DEPOT_TOOLS_WIN_TOOLCHAIN} 0)
|
|
||||||
list(APPEND V8_GYP_ARGS
|
list(APPEND V8_GYP_ARGS
|
||||||
-Dcomponent=static_library
|
-Dcomponent=static_library
|
||||||
-Dlibrary=static_library
|
-Dlibrary=static_library
|
||||||
|
|
@ -346,7 +361,7 @@ elseif (WIN32)
|
||||||
SOURCE_DIR
|
SOURCE_DIR
|
||||||
"${V8_DIR}"
|
"${V8_DIR}"
|
||||||
CONFIGURE_COMMAND
|
CONFIGURE_COMMAND
|
||||||
${CMAKE_COMMAND} -E env GYP_GENERATORS=msvs GYP_MSVS_VERSION=2015 DEPOT_TOOLS_WIN_TOOLCHAIN=0 ${PYTHON_EXECUTABLE} ${GYP_MAIN} ${V8_GYP_ARGS} -Dmode=${MS_TARGET_CONF_LOWER}
|
env GYP_MSVS_VERSION=${GYP_MSVS_VERSION} GYP_GENERATORS=${GYP_GENERATORS} GYP_MSVS_OVERRIDE_PATH=${GYP_MSVS_OVERRIDE_PATH} DEPOT_TOOLS_WIN_TOOLCHAIN=${DEPOT_TOOLS_WIN_TOOLCHAIN} ${PYTHON_EXECUTABLE} ${GYP_MAIN} ${V8_GYP_ARGS} -Dmode=${MS_TARGET_CONF_LOWER}
|
||||||
BUILD_COMMAND
|
BUILD_COMMAND
|
||||||
""
|
""
|
||||||
INSTALL_COMMAND
|
INSTALL_COMMAND
|
||||||
|
|
|
||||||
|
|
@ -236,6 +236,15 @@ def _CreateVersion(name, path, sdk_based=False):
|
||||||
if path:
|
if path:
|
||||||
path = os.path.normpath(path)
|
path = os.path.normpath(path)
|
||||||
versions = {
|
versions = {
|
||||||
|
'2017': VisualStudioVersion('2017',
|
||||||
|
'Visual Studio 2017',
|
||||||
|
solution_version='12.00',
|
||||||
|
project_version='14.0',
|
||||||
|
flat_sln=False,
|
||||||
|
uses_vcxproj=True,
|
||||||
|
path=path,
|
||||||
|
sdk_based=sdk_based,
|
||||||
|
default_toolset='v141'),
|
||||||
'2015': VisualStudioVersion('2015',
|
'2015': VisualStudioVersion('2015',
|
||||||
'Visual Studio 2015',
|
'Visual Studio 2015',
|
||||||
solution_version='12.00',
|
solution_version='12.00',
|
||||||
|
|
@ -432,6 +441,7 @@ def SelectVisualStudioVersion(version='auto', allow_fallback=True):
|
||||||
'2013': ('12.0',),
|
'2013': ('12.0',),
|
||||||
'2013e': ('12.0',),
|
'2013e': ('12.0',),
|
||||||
'2015': ('14.0',),
|
'2015': ('14.0',),
|
||||||
|
'2017': ('14.0',), # hopefully, 2017 can work with 14.0
|
||||||
}
|
}
|
||||||
override_path = os.environ.get('GYP_MSVS_OVERRIDE_PATH')
|
override_path = os.environ.get('GYP_MSVS_OVERRIDE_PATH')
|
||||||
if override_path:
|
if override_path:
|
||||||
|
|
|
||||||
|
|
@ -76,6 +76,11 @@ set(ARANGODB_VERSION
|
||||||
"${ARANGODB_VERSION_MAJOR}.${ARANGODB_VERSION_MINOR}.${ARANGODB_VERSION_REVISION}")
|
"${ARANGODB_VERSION_MAJOR}.${ARANGODB_VERSION_MINOR}.${ARANGODB_VERSION_REVISION}")
|
||||||
|
|
||||||
if (WIN32)
|
if (WIN32)
|
||||||
|
# path containing the OpenSSL find-module and libraries
|
||||||
|
set(WIN_FIND_OPENSSL_PATH "C:/OpenSSL-ArangoDB")
|
||||||
|
if (EXISTS "${WIN_FIND_OPENSSL_PATH}")
|
||||||
|
list(APPEND CMAKE_MODULE_PATH ${WIN_FIND_OPENSSL_PATH})
|
||||||
|
endif()
|
||||||
project(arangodb3 LANGUAGES CXX C VERSION ${ARANGODB_VERSION_MAJOR}.${ARANGODB_VERSION_MINOR})
|
project(arangodb3 LANGUAGES CXX C VERSION ${ARANGODB_VERSION_MAJOR}.${ARANGODB_VERSION_MINOR})
|
||||||
else ()
|
else ()
|
||||||
project(arangodb3 LANGUAGES CXX C ASM VERSION ${ARANGODB_VERSION_MAJOR}.${ARANGODB_VERSION_MINOR})
|
project(arangodb3 LANGUAGES CXX C ASM VERSION ${ARANGODB_VERSION_MAJOR}.${ARANGODB_VERSION_MINOR})
|
||||||
|
|
@ -513,7 +518,9 @@ option(USE_BACKTRACE
|
||||||
|
|
||||||
# iresearch uses backtrace anyway, so we need to find and link libexecinfo
|
# iresearch uses backtrace anyway, so we need to find and link libexecinfo
|
||||||
# for the case that we are on libmusl and not on glibc
|
# for the case that we are on libmusl and not on glibc
|
||||||
find_package(Backtrace)
|
if (NOT MSVC)
|
||||||
|
find_package(Backtrace)
|
||||||
|
endif()
|
||||||
|
|
||||||
if (USE_BACKTRACE)
|
if (USE_BACKTRACE)
|
||||||
if (MSVC)
|
if (MSVC)
|
||||||
|
|
@ -703,13 +710,13 @@ elseif (MSVC)
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
set(CMAKE_C_FLAGS "/MTd" CACHE INTERNAL "default C++ compiler flags")
|
set(CMAKE_C_FLAGS "/MTd" CACHE INTERNAL "default C++ compiler flags")
|
||||||
set(CMAKE_C_FLAGS_DEBUG "/D _DEBUG /MTd /Zi /Ob0 /Od /RTC1" CACHE INTERNAL "C++ debug flags")
|
set(CMAKE_C_FLAGS_DEBUG "/D _DEBUG /MTd /Zi /Ob0 /Od /RTC1 /bigobj" CACHE INTERNAL "C++ debug flags")
|
||||||
set(CMAKE_C_FLAGS_MINSIZEREL "/MT /O1 /Ob1" CACHE INTERNAL "C++ minimal size flags")
|
set(CMAKE_C_FLAGS_MINSIZEREL "/MT /O1 /Ob1" CACHE INTERNAL "C++ minimal size flags")
|
||||||
set(CMAKE_C_FLAGS_RELEASE "/MT /O2 /Ob2" CACHE INTERNAL "C++ release flags")
|
set(CMAKE_C_FLAGS_RELEASE "/MT /O2 /Ob2" CACHE INTERNAL "C++ release flags")
|
||||||
set(CMAKE_C_FLAGS_RELWITHDEBINFO "/MT /Zi /O2 /Ob1" CACHE INTERNAL "C++ release with debug info flags")
|
set(CMAKE_C_FLAGS_RELWITHDEBINFO "/MT /Zi /O2 /Ob1" CACHE INTERNAL "C++ release with debug info flags")
|
||||||
|
|
||||||
set(CMAKE_CXX_FLAGS "/MTd" CACHE INTERNAL "default C++ compiler flags")
|
set(CMAKE_CXX_FLAGS "/MTd" CACHE INTERNAL "default C++ compiler flags")
|
||||||
set(CMAKE_CXX_FLAGS_DEBUG "/D _DEBUG /MTd /Zi /Ob0 /Od /RTC1" CACHE INTERNAL "C++ debug flags")
|
set(CMAKE_CXX_FLAGS_DEBUG "/D _DEBUG /MTd /Zi /Ob0 /Od /RTC1 /bigobj" CACHE INTERNAL "C++ debug flags")
|
||||||
set(CMAKE_CXX_FLAGS_MINSIZEREL "/MT /O1 /Ob1" CACHE INTERNAL "C++ minimal size flags")
|
set(CMAKE_CXX_FLAGS_MINSIZEREL "/MT /O1 /Ob1" CACHE INTERNAL "C++ minimal size flags")
|
||||||
set(CMAKE_CXX_FLAGS_RELEASE "/MT /O2 /Ob2" CACHE INTERNAL "C++ release flags")
|
set(CMAKE_CXX_FLAGS_RELEASE "/MT /O2 /Ob2" CACHE INTERNAL "C++ release flags")
|
||||||
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MT /Zi /O2 /Ob1" CACHE INTERNAL "C++ release with debug info flags")
|
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MT /Zi /O2 /Ob1" CACHE INTERNAL "C++ release with debug info flags")
|
||||||
|
|
@ -845,6 +852,18 @@ include_directories(SYSTEM ${ICU_INCLUDE_DIR})
|
||||||
## OPENSSL
|
## OPENSSL
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
|
# Some special stuff for Mac OSX and homebrew as a preparation for the
|
||||||
|
# generic FindOpenSSL script:
|
||||||
|
if (APPLE AND BREW AND NOT OPENSSL_ROOT_DIR)
|
||||||
|
message("searching openssl with brew (${BREW})")
|
||||||
|
# if we have a brew openssl, prefer it over the elderly system one.
|
||||||
|
execute_process(OUTPUT_VARIABLE BREW_ROOT
|
||||||
|
OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||||
|
COMMAND ${BREW} --prefix)
|
||||||
|
set(OPENSSL_ROOT_DIR "${BREW_ROOT}/opt/openssl")
|
||||||
|
message("auto-set OPENSSL_ROOT_DIR to: ${OPENSSL_ROOT_DIR}")
|
||||||
|
endif ()
|
||||||
|
|
||||||
find_package(OpenSSL REQUIRED)
|
find_package(OpenSSL REQUIRED)
|
||||||
|
|
||||||
include_directories(${OPENSSL_INCLUDE_DIR})
|
include_directories(${OPENSSL_INCLUDE_DIR})
|
||||||
|
|
|
||||||
|
|
@ -181,13 +181,14 @@ case "$1" in
|
||||||
|
|
||||||
debug)
|
debug)
|
||||||
BUILD_CONFIG=Debug
|
BUILD_CONFIG=Debug
|
||||||
|
MAINTAINER_MODE=''
|
||||||
CFLAGS="${CFLAGS} -O0"
|
CFLAGS="${CFLAGS} -O0"
|
||||||
CXXFLAGS="${CXXFLAGS} -O0"
|
CXXFLAGS="${CXXFLAGS} -O0"
|
||||||
CONFIGURE_OPTIONS+=(
|
CONFIGURE_OPTIONS+=(
|
||||||
'-DV8_TARGET_ARCHS=Debug'
|
|
||||||
'-DUSE_MAINTAINER_MODE=On'
|
'-DUSE_MAINTAINER_MODE=On'
|
||||||
'-DUSE_FAILURE_TESTS=On'
|
'-DUSE_FAILURE_TESTS=On'
|
||||||
'-DOPTDBG=On'
|
'-DOPTDBG=On'
|
||||||
|
'-DUSE_BACKTRACE=On'
|
||||||
"-DCMAKE_BUILD_TYPE=${BUILD_CONFIG}"
|
"-DCMAKE_BUILD_TYPE=${BUILD_CONFIG}"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
@ -272,9 +273,10 @@ while [ $# -gt 0 ]; do
|
||||||
PAR=""
|
PAR=""
|
||||||
PARALLEL_BUILDS=""
|
PARALLEL_BUILDS=""
|
||||||
GENERATOR="Visual Studio 14 Win64"
|
GENERATOR="Visual Studio 14 Win64"
|
||||||
|
CONFIGURE_OPTIONS+=("-T")
|
||||||
|
CONFIGURE_OPTIONS+=("v140,host=x64")
|
||||||
MAKE="cmake --build . --config ${BUILD_CONFIG}"
|
MAKE="cmake --build . --config ${BUILD_CONFIG}"
|
||||||
PACKAGE_MAKE="cmake --build . --config ${BUILD_CONFIG} --target"
|
PACKAGE_MAKE="cmake --build . --config ${BUILD_CONFIG} --target"
|
||||||
CONFIGURE_OPTIONS+=(-DV8_TARGET_ARCHS=Release)
|
|
||||||
# MSVC doesn't know howto do our assembler in first place.
|
# MSVC doesn't know howto do our assembler in first place.
|
||||||
ARCH="-DUSE_OPTIMIZE_FOR_ARCHITECTURE=Off"
|
ARCH="-DUSE_OPTIMIZE_FOR_ARCHITECTURE=Off"
|
||||||
export _IsNativeEnvironment=true
|
export _IsNativeEnvironment=true
|
||||||
|
|
|
||||||
|
|
@ -867,8 +867,9 @@ AqlValue Expression::executeSimpleExpressionFCallCxx(
|
||||||
VPackFunctionParameters parameters{arena};
|
VPackFunctionParameters parameters{arena};
|
||||||
|
|
||||||
// same here
|
// same here
|
||||||
SmallVector<uint8_t>::allocator_type::arena_type arena2;
|
SmallVector<uint64_t>::allocator_type::arena_type arena2;
|
||||||
SmallVector<uint8_t> destroyParameters{arena2};
|
SmallVector<uint64_t> destroyParameters{arena2};
|
||||||
|
|
||||||
parameters.reserve(n);
|
parameters.reserve(n);
|
||||||
destroyParameters.reserve(n);
|
destroyParameters.reserve(n);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -43,8 +43,8 @@
|
||||||
#include "VocBase/ticks.h"
|
#include "VocBase/ticks.h"
|
||||||
#include "VocBase/vocbase.h"
|
#include "VocBase/vocbase.h"
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
#ifdef _WIN32
|
||||||
#include <windows.h>
|
#include <io.h>
|
||||||
#else
|
#else
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -55,7 +55,7 @@ using namespace arangodb;
|
||||||
using namespace arangodb::pregel;
|
using namespace arangodb::pregel;
|
||||||
|
|
||||||
static uint64_t TRI_totalSystemMemory() {
|
static uint64_t TRI_totalSystemMemory() {
|
||||||
#ifdef _MSC_VER
|
#ifdef _WIN32
|
||||||
MEMORYSTATUSEX status;
|
MEMORYSTATUSEX status;
|
||||||
status.dwLength = sizeof(status);
|
status.dwLength = sizeof(status);
|
||||||
GlobalMemoryStatusEx(&status);
|
GlobalMemoryStatusEx(&status);
|
||||||
|
|
@ -336,7 +336,8 @@ std::unique_ptr<transaction::Methods> GraphStore<V, E>::_createTransaction() {
|
||||||
transaction::Options transactionOptions;
|
transaction::Options transactionOptions;
|
||||||
transactionOptions.waitForSync = false;
|
transactionOptions.waitForSync = false;
|
||||||
transactionOptions.allowImplicitCollections = true;
|
transactionOptions.allowImplicitCollections = true;
|
||||||
auto ctx = transaction::StandaloneContext::Create(_vocbaseGuard.database());
|
auto ctx =
|
||||||
|
transaction::StandaloneContext::Create(_vocbaseGuard.database());
|
||||||
std::unique_ptr<transaction::Methods> trx(
|
std::unique_ptr<transaction::Methods> trx(
|
||||||
new transaction::UserTransaction(ctx, {}, {}, {}, transactionOptions));
|
new transaction::UserTransaction(ctx, {}, {}, {}, transactionOptions));
|
||||||
Result res = trx->begin();
|
Result res = trx->begin();
|
||||||
|
|
|
||||||
|
|
@ -243,11 +243,6 @@ if (MSVC AND NOT(SKIP_PACKAGING))
|
||||||
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (SSL_NUGET)
|
|
||||||
install (FILES "${LIB_EAY_RELEASE_DLL}" DESTINATION "${CMAKE_INSTALL_BINDIR}/" COMPONENT Libraries)
|
|
||||||
install (FILES "${SSL_EAY_RELEASE_DLL}" DESTINATION "${CMAKE_INSTALL_BINDIR}/" COMPONENT Libraries)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if (THIRDPARTY_SBIN)
|
if (THIRDPARTY_SBIN)
|
||||||
install(FILES ${THIRDPARTY_SBIN}
|
install(FILES ${THIRDPARTY_SBIN}
|
||||||
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
|
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
|
||||||
|
|
|
||||||
|
|
@ -1,548 +0,0 @@
|
||||||
#.rst:
|
|
||||||
# FindOpenSSL
|
|
||||||
# -----------
|
|
||||||
#
|
|
||||||
# Find the OpenSSL encryption library.
|
|
||||||
#
|
|
||||||
# Imported Targets
|
|
||||||
# ^^^^^^^^^^^^^^^^
|
|
||||||
#
|
|
||||||
# This module defines the following :prop_tgt:`IMPORTED` targets:
|
|
||||||
#
|
|
||||||
# ``OpenSSL::SSL``
|
|
||||||
# The OpenSSL ``ssl`` library, if found.
|
|
||||||
# ``OpenSSL::Crypto``
|
|
||||||
# The OpenSSL ``crypto`` library, if found.
|
|
||||||
#
|
|
||||||
# Result Variables
|
|
||||||
# ^^^^^^^^^^^^^^^^
|
|
||||||
#
|
|
||||||
# This module will set the following variables in your project:
|
|
||||||
#
|
|
||||||
# ``OPENSSL_FOUND``
|
|
||||||
# System has the OpenSSL library.
|
|
||||||
# ``OPENSSL_INCLUDE_DIR``
|
|
||||||
# The OpenSSL include directory.
|
|
||||||
# ``OPENSSL_CRYPTO_LIBRARY``
|
|
||||||
# The OpenSSL crypto library.
|
|
||||||
# ``OPENSSL_SSL_LIBRARY``
|
|
||||||
# The OpenSSL SSL library.
|
|
||||||
# ``OPENSSL_LIBRARIES``
|
|
||||||
# All OpenSSL libraries.
|
|
||||||
# ``OPENSSL_VERSION``
|
|
||||||
# This is set to ``$major.$minor.$revision$patch`` (e.g. ``0.9.8s``).
|
|
||||||
#
|
|
||||||
# Hints
|
|
||||||
# ^^^^^
|
|
||||||
#
|
|
||||||
# Set ``OPENSSL_ROOT_DIR`` to the root directory of an OpenSSL installation.
|
|
||||||
# Set ``OPENSSL_USE_STATIC_LIBS`` to ``TRUE`` to look for static libraries.
|
|
||||||
# Set ``OPENSSL_MSVC_STATIC_RT`` set ``TRUE`` to choose the MT version of the lib.
|
|
||||||
|
|
||||||
#=============================================================================
|
|
||||||
# Copyright 2006-2009 Kitware, Inc.
|
|
||||||
# Copyright 2006 Alexander Neundorf <neundorf@kde.org>
|
|
||||||
# Copyright 2009-2011 Mathieu Malaterre <mathieu.malaterre@gmail.com>
|
|
||||||
#
|
|
||||||
# Distributed under the OSI-approved BSD License (the "License");
|
|
||||||
# see accompanying file Copyright.txt for details.
|
|
||||||
#
|
|
||||||
# This software is distributed WITHOUT ANY WARRANTY; without even the
|
|
||||||
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
|
||||||
# See the License for more information.
|
|
||||||
#=============================================================================
|
|
||||||
# (To distribute this file outside of CMake, substitute the full
|
|
||||||
# License text for the above reference.)
|
|
||||||
|
|
||||||
if (APPLE AND BREW AND NOT OPENSSL_ROOT_DIR)
|
|
||||||
message("searching openssl with brew (${BREW})")
|
|
||||||
# if we have a brew openssl, prefer it over the elderly system one.
|
|
||||||
execute_process(OUTPUT_VARIABLE BREW_ROOT
|
|
||||||
OUTPUT_STRIP_TRAILING_WHITESPACE
|
|
||||||
COMMAND ${BREW} --prefix)
|
|
||||||
set(OPENSSL_ROOT_DIR "${BREW_ROOT}/opt/openssl")
|
|
||||||
message("auto-set OPENSSL_ROOT_DIR to: ${OPENSSL_ROOT_DIR}")
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
if (UNIX)
|
|
||||||
find_package(PkgConfig QUIET)
|
|
||||||
pkg_check_modules(_OPENSSL openssl)
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
# Support preference of static libs by adjusting CMAKE_FIND_LIBRARY_SUFFIXES
|
|
||||||
if(OPENSSL_USE_STATIC_LIBS)
|
|
||||||
set(_openssl_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
|
|
||||||
if(WIN32)
|
|
||||||
set(CMAKE_FIND_LIBRARY_SUFFIXES .lib .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
|
|
||||||
else()
|
|
||||||
set(CMAKE_FIND_LIBRARY_SUFFIXES .a )
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
|
|
||||||
if (WIN32)
|
|
||||||
# 32-bit not officially supported anymore anyway
|
|
||||||
set(SSL_BITS "x64")
|
|
||||||
# v140 corresponds to VS 2015
|
|
||||||
set(SSL_NUGET_DIR "lib/native/v140/windesktop/msvcstl/dyn/rt-dyn")
|
|
||||||
|
|
||||||
string(REPLACE "\\" "/" USER_PATH "$ENV{USERPROFILE}")
|
|
||||||
set(SSL_NUGET_ROOT "${USER_PATH}/.nuget/packages/openssl.v140.windesktop.msvcstl.dyn.rt-dyn.${SSL_BITS}")
|
|
||||||
if (NOT OPENSSL_ROOT_DIR AND IS_DIRECTORY ${SSL_NUGET_ROOT})
|
|
||||||
# find latest version based on folder name and assign to OPENSSL_ROOT_DIR
|
|
||||||
FILE(GLOB dirlist RELATIVE ${SSL_NUGET_ROOT} ${SSL_NUGET_ROOT}/*)
|
|
||||||
list(SORT dirlist)
|
|
||||||
list(LENGTH dirlist listlength)
|
|
||||||
math(EXPR lastindex "${listlength}-1")
|
|
||||||
list(GET dirlist ${lastindex} latestversion)
|
|
||||||
set(OPENSSL_ROOT_DIR
|
|
||||||
"${SSL_NUGET_ROOT}/${latestversion}"
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
if (IS_DIRECTORY "${OPENSSL_ROOT_DIR}/build/native/")
|
|
||||||
set(SSL_NUGET TRUE)
|
|
||||||
else()
|
|
||||||
set(SSL_NUGET FALSE)
|
|
||||||
endif()
|
|
||||||
if (OPENSSL_ROOT_DIR AND SSL_NUGET)
|
|
||||||
message("Found nuGET installation of OpenSSL!")
|
|
||||||
# its an openssl downloaded via nuget!
|
|
||||||
set(OPENSSL_INCLUDE "${OPENSSL_ROOT_DIR}/build/native/include")
|
|
||||||
set(_OPENSSL_ROOT_HINTS "${OPENSSL_ROOT_DIR}/build/native/include")
|
|
||||||
|
|
||||||
set(OPENSSL_LIB_DIR "${OPENSSL_ROOT_DIR}/${SSL_NUGET_DIR}/${SSL_BITS}")
|
|
||||||
set(_OPENSSL_ROOT_HINTS "${OPENSSL_ROOT_DIR}/build/native/include")
|
|
||||||
|
|
||||||
set(_OPENSSL_ROOT_PATHS
|
|
||||||
"${OPENSSL_ROOT_DIR}/build/native/include"
|
|
||||||
"${OPENSSL_ROOT_DIR}/${SSL_NUGET_DIR}/${SSL_BITS}/")
|
|
||||||
else()
|
|
||||||
# http://www.slproweb.com/products/Win32OpenSSL.html
|
|
||||||
set(_OPENSSL_ROOT_HINTS
|
|
||||||
${OPENSSL_ROOT_DIR}
|
|
||||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;Inno Setup: App Path]"
|
|
||||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (64-bit)_is1;Inno Setup: App Path]"
|
|
||||||
$ENV{OPENSSL_ROOT_DIR}
|
|
||||||
)
|
|
||||||
set(_OPENSSL_ROOT_PATHS
|
|
||||||
$ENV{PATH}
|
|
||||||
)
|
|
||||||
file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _programfiles)
|
|
||||||
set(_OPENSSL_ROOT_PATHS
|
|
||||||
"${_programfiles}/OpenSSL"
|
|
||||||
"${_programfiles}/OpenSSL-Win32"
|
|
||||||
"${_programfiles}/OpenSSL-Win64"
|
|
||||||
"C:/OpenSSL/"
|
|
||||||
"C:/OpenSSL-Win32/"
|
|
||||||
"C:/OpenSSL-Win64/"
|
|
||||||
)
|
|
||||||
unset(_programfiles)
|
|
||||||
# none of the above will actually set OPENSSL_ROOT_DIR, but one could
|
|
||||||
# simply use the parent dir of the include dir (defined further below!)
|
|
||||||
#get_filename_component(OPENSSL_ROOT_DIR ${OPENSSL_INCLUDE_DIR} DIRECTORY)
|
|
||||||
endif()
|
|
||||||
else ()
|
|
||||||
set(_OPENSSL_ROOT_HINTS
|
|
||||||
${OPENSSL_ROOT_DIR}
|
|
||||||
ENV OPENSSL_ROOT_DIR
|
|
||||||
)
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
set(_OPENSSL_ROOT_HINTS_AND_PATHS
|
|
||||||
HINTS ${_OPENSSL_ROOT_HINTS}
|
|
||||||
PATHS ${_OPENSSL_ROOT_PATHS}
|
|
||||||
)
|
|
||||||
|
|
||||||
find_path(OPENSSL_INCLUDE_DIR
|
|
||||||
NAMES
|
|
||||||
openssl/ssl.h
|
|
||||||
${_OPENSSL_ROOT_HINTS_AND_PATHS}
|
|
||||||
HINTS
|
|
||||||
${_OPENSSL_INCLUDEDIR}
|
|
||||||
PATH_SUFFIXES
|
|
||||||
include
|
|
||||||
)
|
|
||||||
|
|
||||||
if(WIN32 AND NOT CYGWIN)
|
|
||||||
if (SSL_NUGET)
|
|
||||||
# /MD and /MDd are the standard values - if someone wants to use
|
|
||||||
# others, the libnames have to change here too
|
|
||||||
# use also ssl and ssleay32 in debug as fallback for openssl < 0.9.8b
|
|
||||||
# enable OPENSSL_MSVC_STATIC_RT to get the libs build /MT (Multithreaded no-DLL)
|
|
||||||
|
|
||||||
# Implementation details:
|
|
||||||
# We are using the libraries located in the VC subdir instead of the parent directory eventhough :
|
|
||||||
# libeay32MD.lib is identical to ../libeay32.lib, and
|
|
||||||
# ssleay32MD.lib is identical to ../ssleay32.lib
|
|
||||||
# enable OPENSSL_USE_STATIC_LIBS to use the static libs located in lib/VC/static
|
|
||||||
|
|
||||||
#if (OPENSSL_MSVC_STATIC_RT)
|
|
||||||
# set(_OPENSSL_MSVC_RT_MODE "MT")
|
|
||||||
#else ()
|
|
||||||
# set(_OPENSSL_MSVC_RT_MODE "MD")
|
|
||||||
#endif ()
|
|
||||||
|
|
||||||
set(LIB_EAY_DEBUG LIB_EAY_DEBUG-NOTFOUND)
|
|
||||||
if (EXISTS "${OPENSSL_LIB_DIR}/debug/libeay32.lib")
|
|
||||||
set(LIB_EAY_DEBUG "${OPENSSL_LIB_DIR}/debug/libeay32.lib")
|
|
||||||
set(LIB_EAY_DEBUG_DLL "${OPENSSL_LIB_DIR}/debug/libeay32.dll")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
set(LIB_EAY_RELEASE LIB_EAY_RELEASE-NOTFOUND)
|
|
||||||
if (EXISTS "${OPENSSL_LIB_DIR}/release/libeay32.lib")
|
|
||||||
set(LIB_EAY_RELEASE "${OPENSSL_LIB_DIR}/release/libeay32.lib")
|
|
||||||
set(LIB_EAY_RELEASE_DLL "${OPENSSL_LIB_DIR}/release/libeay32.dll")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
set(SSL_EAY_DEBUG SSL_EAY_DEBUG-NOTFOUND)
|
|
||||||
if (EXISTS "${OPENSSL_LIB_DIR}/debug/ssleay32.lib")
|
|
||||||
set(SSL_EAY_DEBUG "${OPENSSL_LIB_DIR}/debug/ssleay32.lib")
|
|
||||||
set(SSL_EAY_DEBUG_DLL "${OPENSSL_LIB_DIR}/debug/ssleay32.dll")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
set(SSL_EAY_RELEASE SSL_EAY_RELEASE-NOTFOUND)
|
|
||||||
if (EXISTS "${OPENSSL_LIB_DIR}/release/ssleay32.lib")
|
|
||||||
set(SSL_EAY_RELEASE "${OPENSSL_LIB_DIR}/release/ssleay32.lib")
|
|
||||||
set(SSL_EAY_RELEASE_DLL "${OPENSSL_LIB_DIR}/release/ssleay32.dll")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
set(LIB_EAY_LIBRARY_DEBUG "${LIB_EAY_DEBUG}")
|
|
||||||
set(LIB_EAY_LIBRARY_RELEASE "${LIB_EAY_RELEASE}")
|
|
||||||
set(SSL_EAY_LIBRARY_DEBUG "${SSL_EAY_DEBUG}")
|
|
||||||
set(SSL_EAY_LIBRARY_RELEASE "${SSL_EAY_RELEASE}")
|
|
||||||
|
|
||||||
include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
|
|
||||||
select_library_configurations(LIB_EAY)
|
|
||||||
select_library_configurations(SSL_EAY)
|
|
||||||
|
|
||||||
mark_as_advanced(LIB_EAY_LIBRARY_DEBUG LIB_EAY_LIBRARY_RELEASE
|
|
||||||
SSL_EAY_LIBRARY_DEBUG SSL_EAY_LIBRARY_RELEASE)
|
|
||||||
set(OPENSSL_SSL_LIBRARY ${SSL_EAY_LIBRARY} )
|
|
||||||
set(OPENSSL_CRYPTO_LIBRARY ${LIB_EAY_LIBRARY} )
|
|
||||||
set(OPENSSL_LIBRARIES ${SSL_EAY_LIBRARY} ${LIB_EAY_LIBRARY} )
|
|
||||||
|
|
||||||
elseif(MSVC)
|
|
||||||
# /MD and /MDd are the standard values - if someone wants to use
|
|
||||||
# others, the libnames have to change here too
|
|
||||||
# use also ssl and ssleay32 in debug as fallback for openssl < 0.9.8b
|
|
||||||
# enable OPENSSL_MSVC_STATIC_RT to get the libs build /MT (Multithreaded no-DLL)
|
|
||||||
# In Visual C++ naming convention each of these four kinds of Windows libraries has it's standard suffix:
|
|
||||||
# * MD for dynamic-release
|
|
||||||
# * MDd for dynamic-debug
|
|
||||||
# * MT for static-release
|
|
||||||
# * MTd for static-debug
|
|
||||||
|
|
||||||
# Implementation details:
|
|
||||||
# We are using the libraries located in the VC subdir instead of the parent directory eventhough :
|
|
||||||
# libeay32MD.lib is identical to ../libeay32.lib, and
|
|
||||||
# ssleay32MD.lib is identical to ../ssleay32.lib
|
|
||||||
# enable OPENSSL_USE_STATIC_LIBS to use the static libs located in lib/VC/static
|
|
||||||
|
|
||||||
if (OPENSSL_MSVC_STATIC_RT)
|
|
||||||
set(_OPENSSL_MSVC_RT_MODE "MT")
|
|
||||||
else ()
|
|
||||||
set(_OPENSSL_MSVC_RT_MODE "MD")
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
if(OPENSSL_USE_STATIC_LIBS)
|
|
||||||
set(_OPENSSL_PATH_SUFFIXES
|
|
||||||
"lib"
|
|
||||||
"VC/static"
|
|
||||||
"lib/VC/static"
|
|
||||||
)
|
|
||||||
else()
|
|
||||||
set(_OPENSSL_PATH_SUFFIXES
|
|
||||||
"lib"
|
|
||||||
"VC"
|
|
||||||
"lib/VC"
|
|
||||||
)
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
find_library(LIB_EAY_DEBUG
|
|
||||||
NAMES
|
|
||||||
libeay32${_OPENSSL_MSVC_RT_MODE}d
|
|
||||||
libeay32d
|
|
||||||
${_OPENSSL_ROOT_HINTS_AND_PATHS}
|
|
||||||
PATH_SUFFIXES
|
|
||||||
${_OPENSSL_PATH_SUFFIXES}
|
|
||||||
)
|
|
||||||
|
|
||||||
find_library(LIB_EAY_RELEASE
|
|
||||||
NAMES
|
|
||||||
libeay32${_OPENSSL_MSVC_RT_MODE}
|
|
||||||
libeay32
|
|
||||||
${_OPENSSL_ROOT_HINTS_AND_PATHS}
|
|
||||||
PATH_SUFFIXES
|
|
||||||
${_OPENSSL_PATH_SUFFIXES}
|
|
||||||
)
|
|
||||||
|
|
||||||
find_library(SSL_EAY_DEBUG
|
|
||||||
NAMES
|
|
||||||
ssleay32${_OPENSSL_MSVC_RT_MODE}d
|
|
||||||
ssleay32d
|
|
||||||
${_OPENSSL_ROOT_HINTS_AND_PATHS}
|
|
||||||
PATH_SUFFIXES
|
|
||||||
${_OPENSSL_PATH_SUFFIXES}
|
|
||||||
)
|
|
||||||
|
|
||||||
find_library(SSL_EAY_RELEASE
|
|
||||||
NAMES
|
|
||||||
ssleay32${_OPENSSL_MSVC_RT_MODE}
|
|
||||||
ssleay32
|
|
||||||
ssl
|
|
||||||
${_OPENSSL_ROOT_HINTS_AND_PATHS}
|
|
||||||
PATH_SUFFIXES
|
|
||||||
${_OPENSSL_PATH_SUFFIXES}
|
|
||||||
)
|
|
||||||
|
|
||||||
set(LIB_EAY_LIBRARY_DEBUG "${LIB_EAY_DEBUG}")
|
|
||||||
set(LIB_EAY_LIBRARY_RELEASE "${LIB_EAY_RELEASE}")
|
|
||||||
set(SSL_EAY_LIBRARY_DEBUG "${SSL_EAY_DEBUG}")
|
|
||||||
set(SSL_EAY_LIBRARY_RELEASE "${SSL_EAY_RELEASE}")
|
|
||||||
|
|
||||||
include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
|
|
||||||
select_library_configurations(LIB_EAY)
|
|
||||||
select_library_configurations(SSL_EAY)
|
|
||||||
|
|
||||||
mark_as_advanced(LIB_EAY_LIBRARY_DEBUG LIB_EAY_LIBRARY_RELEASE
|
|
||||||
SSL_EAY_LIBRARY_DEBUG SSL_EAY_LIBRARY_RELEASE)
|
|
||||||
set(OPENSSL_SSL_LIBRARY ${SSL_EAY_LIBRARY} )
|
|
||||||
set(OPENSSL_CRYPTO_LIBRARY ${LIB_EAY_LIBRARY} )
|
|
||||||
set(OPENSSL_LIBRARIES ${SSL_EAY_LIBRARY} ${LIB_EAY_LIBRARY} )
|
|
||||||
elseif(MINGW)
|
|
||||||
# same player, for MinGW
|
|
||||||
set(LIB_EAY_NAMES crypto libeay32)
|
|
||||||
set(SSL_EAY_NAMES ssl ssleay32)
|
|
||||||
find_library(LIB_EAY
|
|
||||||
NAMES
|
|
||||||
${LIB_EAY_NAMES}
|
|
||||||
${_OPENSSL_ROOT_HINTS_AND_PATHS}
|
|
||||||
PATH_SUFFIXES
|
|
||||||
"lib"
|
|
||||||
"lib/MinGW"
|
|
||||||
)
|
|
||||||
|
|
||||||
find_library(SSL_EAY
|
|
||||||
NAMES
|
|
||||||
${SSL_EAY_NAMES}
|
|
||||||
${_OPENSSL_ROOT_HINTS_AND_PATHS}
|
|
||||||
PATH_SUFFIXES
|
|
||||||
"lib"
|
|
||||||
"lib/MinGW"
|
|
||||||
)
|
|
||||||
|
|
||||||
mark_as_advanced(SSL_EAY LIB_EAY)
|
|
||||||
set(OPENSSL_SSL_LIBRARY ${SSL_EAY} )
|
|
||||||
set(OPENSSL_CRYPTO_LIBRARY ${LIB_EAY} )
|
|
||||||
set(OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY} )
|
|
||||||
unset(LIB_EAY_NAMES)
|
|
||||||
unset(SSL_EAY_NAMES)
|
|
||||||
else()
|
|
||||||
# Not sure what to pick for -say- intel, let's use the toplevel ones and hope someone report issues:
|
|
||||||
find_library(LIB_EAY
|
|
||||||
NAMES
|
|
||||||
libeay32
|
|
||||||
${_OPENSSL_ROOT_HINTS_AND_PATHS}
|
|
||||||
HINTS
|
|
||||||
${_OPENSSL_LIBDIR}
|
|
||||||
PATH_SUFFIXES
|
|
||||||
lib
|
|
||||||
)
|
|
||||||
|
|
||||||
find_library(SSL_EAY
|
|
||||||
NAMES
|
|
||||||
ssleay32
|
|
||||||
${_OPENSSL_ROOT_HINTS_AND_PATHS}
|
|
||||||
HINTS
|
|
||||||
${_OPENSSL_LIBDIR}
|
|
||||||
PATH_SUFFIXES
|
|
||||||
lib
|
|
||||||
)
|
|
||||||
|
|
||||||
mark_as_advanced(SSL_EAY LIB_EAY)
|
|
||||||
set(OPENSSL_SSL_LIBRARY ${SSL_EAY} )
|
|
||||||
set(OPENSSL_CRYPTO_LIBRARY ${LIB_EAY} )
|
|
||||||
set(OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY} )
|
|
||||||
endif()
|
|
||||||
else()
|
|
||||||
find_library(OPENSSL_SSL_LIBRARY
|
|
||||||
NAMES
|
|
||||||
ssl
|
|
||||||
ssleay32
|
|
||||||
ssleay32MD
|
|
||||||
${_OPENSSL_ROOT_HINTS_AND_PATHS}
|
|
||||||
HINTS
|
|
||||||
${_OPENSSL_LIBDIR}
|
|
||||||
PATH_SUFFIXES
|
|
||||||
lib
|
|
||||||
)
|
|
||||||
|
|
||||||
find_library(OPENSSL_CRYPTO_LIBRARY
|
|
||||||
NAMES
|
|
||||||
crypto
|
|
||||||
${_OPENSSL_ROOT_HINTS_AND_PATHS}
|
|
||||||
HINTS
|
|
||||||
${_OPENSSL_LIBDIR}
|
|
||||||
PATH_SUFFIXES
|
|
||||||
lib
|
|
||||||
)
|
|
||||||
|
|
||||||
mark_as_advanced(OPENSSL_CRYPTO_LIBRARY OPENSSL_SSL_LIBRARY)
|
|
||||||
|
|
||||||
# compat defines
|
|
||||||
set(OPENSSL_SSL_LIBRARIES ${OPENSSL_SSL_LIBRARY})
|
|
||||||
set(OPENSSL_CRYPTO_LIBRARIES ${OPENSSL_CRYPTO_LIBRARY})
|
|
||||||
|
|
||||||
set(OPENSSL_LIBRARIES ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY})
|
|
||||||
|
|
||||||
endif()
|
|
||||||
|
|
||||||
function(from_hex HEX DEC)
|
|
||||||
string(TOUPPER "${HEX}" HEX)
|
|
||||||
set(_res 0)
|
|
||||||
string(LENGTH "${HEX}" _strlen)
|
|
||||||
|
|
||||||
while (_strlen GREATER 0)
|
|
||||||
math(EXPR _res "${_res} * 16")
|
|
||||||
string(SUBSTRING "${HEX}" 0 1 NIBBLE)
|
|
||||||
string(SUBSTRING "${HEX}" 1 -1 HEX)
|
|
||||||
if (NIBBLE STREQUAL "A")
|
|
||||||
math(EXPR _res "${_res} + 10")
|
|
||||||
elseif (NIBBLE STREQUAL "B")
|
|
||||||
math(EXPR _res "${_res} + 11")
|
|
||||||
elseif (NIBBLE STREQUAL "C")
|
|
||||||
math(EXPR _res "${_res} + 12")
|
|
||||||
elseif (NIBBLE STREQUAL "D")
|
|
||||||
math(EXPR _res "${_res} + 13")
|
|
||||||
elseif (NIBBLE STREQUAL "E")
|
|
||||||
math(EXPR _res "${_res} + 14")
|
|
||||||
elseif (NIBBLE STREQUAL "F")
|
|
||||||
math(EXPR _res "${_res} + 15")
|
|
||||||
else()
|
|
||||||
math(EXPR _res "${_res} + ${NIBBLE}")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
string(LENGTH "${HEX}" _strlen)
|
|
||||||
endwhile()
|
|
||||||
|
|
||||||
set(${DEC} ${_res} PARENT_SCOPE)
|
|
||||||
endfunction()
|
|
||||||
|
|
||||||
if (OPENSSL_INCLUDE_DIR)
|
|
||||||
if(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h")
|
|
||||||
file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" openssl_version_str
|
|
||||||
REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*")
|
|
||||||
|
|
||||||
# The version number is encoded as 0xMNNFFPPS: major minor fix patch status
|
|
||||||
# The status gives if this is a developer or prerelease and is ignored here.
|
|
||||||
# Major, minor, and fix directly translate into the version numbers shown in
|
|
||||||
# the string. The patch field translates to the single character suffix that
|
|
||||||
# indicates the bug fix state, which 00 -> nothing, 01 -> a, 02 -> b and so
|
|
||||||
# on.
|
|
||||||
|
|
||||||
string(REGEX REPLACE "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F]).*$"
|
|
||||||
"\\1;\\2;\\3;\\4;\\5" OPENSSL_VERSION_LIST "${openssl_version_str}")
|
|
||||||
list(GET OPENSSL_VERSION_LIST 0 OPENSSL_VERSION_MAJOR)
|
|
||||||
list(GET OPENSSL_VERSION_LIST 1 OPENSSL_VERSION_MINOR)
|
|
||||||
from_hex("${OPENSSL_VERSION_MINOR}" OPENSSL_VERSION_MINOR)
|
|
||||||
list(GET OPENSSL_VERSION_LIST 2 OPENSSL_VERSION_FIX)
|
|
||||||
from_hex("${OPENSSL_VERSION_FIX}" OPENSSL_VERSION_FIX)
|
|
||||||
list(GET OPENSSL_VERSION_LIST 3 OPENSSL_VERSION_PATCH)
|
|
||||||
|
|
||||||
if (NOT OPENSSL_VERSION_PATCH STREQUAL "00")
|
|
||||||
from_hex("${OPENSSL_VERSION_PATCH}" _tmp)
|
|
||||||
# 96 is the ASCII code of 'a' minus 1
|
|
||||||
math(EXPR OPENSSL_VERSION_PATCH_ASCII "${_tmp} + 96")
|
|
||||||
unset(_tmp)
|
|
||||||
# Once anyone knows how OpenSSL would call the patch versions beyond 'z'
|
|
||||||
# this should be updated to handle that, too. This has not happened yet
|
|
||||||
# so it is simply ignored here for now.
|
|
||||||
string(ASCII "${OPENSSL_VERSION_PATCH_ASCII}" OPENSSL_VERSION_PATCH_STRING)
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
set(OPENSSL_VERSION "${OPENSSL_VERSION_MAJOR}.${OPENSSL_VERSION_MINOR}.${OPENSSL_VERSION_FIX}${OPENSSL_VERSION_PATCH_STRING}")
|
|
||||||
endif ()
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
|
|
||||||
|
|
||||||
if (OPENSSL_VERSION)
|
|
||||||
find_package_handle_standard_args(OpenSSL
|
|
||||||
REQUIRED_VARS
|
|
||||||
OPENSSL_LIBRARIES
|
|
||||||
OPENSSL_INCLUDE_DIR
|
|
||||||
VERSION_VAR
|
|
||||||
OPENSSL_VERSION
|
|
||||||
FAIL_MESSAGE
|
|
||||||
"Could NOT find OpenSSL, try to set the path to OpenSSL root folder in the system variable OPENSSL_ROOT_DIR"
|
|
||||||
)
|
|
||||||
else ()
|
|
||||||
find_package_handle_standard_args(OpenSSL "Could NOT find OpenSSL, try to set the path to OpenSSL root folder in the system variable OPENSSL_ROOT_DIR"
|
|
||||||
OPENSSL_LIBRARIES
|
|
||||||
OPENSSL_INCLUDE_DIR
|
|
||||||
)
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
mark_as_advanced(OPENSSL_INCLUDE_DIR OPENSSL_LIBRARIES)
|
|
||||||
if(OPENSSL_FOUND)
|
|
||||||
if(NOT TARGET OpenSSL::Crypto AND
|
|
||||||
(EXISTS "${OPENSSL_CRYPTO_LIBRARY}" OR
|
|
||||||
EXISTS "${LIB_EAY_LIBRARY_DEBUG}" OR
|
|
||||||
EXISTS "${LIB_EAY_LIBRARY_RELEASE}")
|
|
||||||
)
|
|
||||||
add_library(OpenSSL::Crypto UNKNOWN IMPORTED)
|
|
||||||
set_target_properties(OpenSSL::Crypto PROPERTIES
|
|
||||||
INTERFACE_INCLUDE_DIRECTORIES "${OPENSSL_INCLUDE_DIR}")
|
|
||||||
if(EXISTS "${OPENSSL_CRYPTO_LIBRARY}")
|
|
||||||
set_target_properties(OpenSSL::Crypto PROPERTIES
|
|
||||||
IMPORTED_LINK_INTERFACE_LANGUAGES "C"
|
|
||||||
IMPORTED_LOCATION "${OPENSSL_CRYPTO_LIBRARY}")
|
|
||||||
endif()
|
|
||||||
if(EXISTS "${LIB_EAY_LIBRARY_DEBUG}")
|
|
||||||
set_property(TARGET OpenSSL::Crypto APPEND PROPERTY
|
|
||||||
IMPORTED_CONFIGURATIONS DEBUG)
|
|
||||||
set_target_properties(OpenSSL::Crypto PROPERTIES
|
|
||||||
IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "C"
|
|
||||||
IMPORTED_LOCATION_DEBUG "${LIB_EAY_LIBRARY_DEBUG}")
|
|
||||||
endif()
|
|
||||||
if(EXISTS "${LIB_EAY_LIBRARY_RELEASE}")
|
|
||||||
set_property(TARGET OpenSSL::Crypto APPEND PROPERTY
|
|
||||||
IMPORTED_CONFIGURATIONS RELEASE)
|
|
||||||
set_target_properties(OpenSSL::Crypto PROPERTIES
|
|
||||||
IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "C"
|
|
||||||
IMPORTED_LOCATION_RELEASE "${LIB_EAY_LIBRARY_RELEASE}")
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
if(NOT TARGET OpenSSL::SSL AND
|
|
||||||
(EXISTS "${OPENSSL_SSL_LIBRARY}" OR
|
|
||||||
EXISTS "${SSL_EAY_LIBRARY_DEBUG}" OR
|
|
||||||
EXISTS "${SSL_EAY_LIBRARY_RELEASE}")
|
|
||||||
)
|
|
||||||
add_library(OpenSSL::SSL UNKNOWN IMPORTED)
|
|
||||||
set_target_properties(OpenSSL::SSL PROPERTIES
|
|
||||||
INTERFACE_INCLUDE_DIRECTORIES "${OPENSSL_INCLUDE_DIR}")
|
|
||||||
if(EXISTS "${OPENSSL_SSL_LIBRARY}")
|
|
||||||
set_target_properties(OpenSSL::SSL PROPERTIES
|
|
||||||
IMPORTED_LINK_INTERFACE_LANGUAGES "C"
|
|
||||||
IMPORTED_LOCATION "${OPENSSL_SSL_LIBRARY}")
|
|
||||||
endif()
|
|
||||||
if(EXISTS "${SSL_EAY_LIBRARY_DEBUG}")
|
|
||||||
set_property(TARGET OpenSSL::SSL APPEND PROPERTY
|
|
||||||
IMPORTED_CONFIGURATIONS DEBUG)
|
|
||||||
set_target_properties(OpenSSL::SSL PROPERTIES
|
|
||||||
IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "C"
|
|
||||||
IMPORTED_LOCATION_DEBUG "${SSL_EAY_LIBRARY_DEBUG}")
|
|
||||||
endif()
|
|
||||||
if(EXISTS "${SSL_EAY_LIBRARY_RELEASE}")
|
|
||||||
set_property(TARGET OpenSSL::SSL APPEND PROPERTY
|
|
||||||
IMPORTED_CONFIGURATIONS RELEASE)
|
|
||||||
set_target_properties(OpenSSL::SSL PROPERTIES
|
|
||||||
IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "C"
|
|
||||||
IMPORTED_LOCATION_RELEASE "${SSL_EAY_LIBRARY_RELEASE}")
|
|
||||||
endif()
|
|
||||||
if(TARGET OpenSSL::Crypto)
|
|
||||||
set_target_properties(OpenSSL::SSL PROPERTIES
|
|
||||||
INTERFACE_LINK_LIBRARIES OpenSSL::Crypto)
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
@ -24,6 +24,9 @@
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
#include <DbgHelp.h>
|
#include <DbgHelp.h>
|
||||||
|
#if ARANGODB_ENABLE_BACKTRACE
|
||||||
|
#include <iostream>
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "Basics/FileUtils.h"
|
#include "Basics/FileUtils.h"
|
||||||
|
|
|
||||||
|
|
@ -33,6 +33,8 @@
|
||||||
#include <crtdbg.h>
|
#include <crtdbg.h>
|
||||||
#include <atlstr.h>
|
#include <atlstr.h>
|
||||||
#include <VersionHelpers.h>
|
#include <VersionHelpers.h>
|
||||||
|
#include <unicode/uchar.h>
|
||||||
|
#include <unicode/unistr.h>
|
||||||
|
|
||||||
#include "Logger/Logger.h"
|
#include "Logger/Logger.h"
|
||||||
#include "Basics/files.h"
|
#include "Basics/files.h"
|
||||||
|
|
@ -75,14 +77,41 @@ int getpagesize(void) {
|
||||||
// This is not of much use since no values can be returned. All we can do
|
// This is not of much use since no values can be returned. All we can do
|
||||||
// for now is to ignore error and hope it goes away!
|
// for now is to ignore error and hope it goes away!
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
static void InvalidParameterHandler(
|
static void InvalidParameterHandler(
|
||||||
const wchar_t* expression, // expression sent to function - NULL
|
const wchar_t* expression, // expression sent to function - NULL
|
||||||
const wchar_t* function, // name of function - NULL
|
const wchar_t* function, // name of function - NULL
|
||||||
const wchar_t* file, // file where code resides - NULL
|
const wchar_t* file, // file where code resides - NULL
|
||||||
unsigned int line, // line within file - NULL
|
unsigned int line, // line within file - NULL
|
||||||
uintptr_t pReserved) { // in case microsoft forget something
|
uintptr_t pReserved) { // in case microsoft forget something
|
||||||
LOG_TOPIC(ERR, arangodb::Logger::FIXME) << "Invalid handle parameter passed";
|
|
||||||
|
#ifdef ARANGODB_ENABLE_MAINTAINER_MODE
|
||||||
|
std::string exp;
|
||||||
|
std::string func;
|
||||||
|
std::string fileName;
|
||||||
|
|
||||||
|
UnicodeString uStr;
|
||||||
|
uStr = expression;
|
||||||
|
uStr.toUTF8String(exp);
|
||||||
|
uStr = function;
|
||||||
|
uStr.toUTF8String(func);
|
||||||
|
uStr = file;
|
||||||
|
uStr.toUTF8String(fileName);
|
||||||
|
|
||||||
|
std::string bt;
|
||||||
|
TRI_GetBacktrace(bt);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
LOG_TOPIC(ERR, arangodb::Logger::FIXME) <<
|
||||||
|
"Invalid handle parameter passed"
|
||||||
|
#ifdef ARANGODB_ENABLE_MAINTAINER_MODE
|
||||||
|
<<
|
||||||
|
" Expression: " << exp <<
|
||||||
|
" Function: " << func <<
|
||||||
|
" File: " << fileName <<
|
||||||
|
" Line: " << std::to_string(line) <<
|
||||||
|
" Backtrace: " << bt
|
||||||
|
#endif
|
||||||
|
;
|
||||||
}
|
}
|
||||||
|
|
||||||
int initializeWindows(const TRI_win_initialize_e initializeWhat,
|
int initializeWindows(const TRI_win_initialize_e initializeWhat,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue