8000 backport more aspects of vst2015 migration by dothebart · Pull Request #7078 · arangodb/arangodb · GitHub
[go: up one dir, main page]
Skip to content

backport more aspects of vst2015 migration #7078

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 25, 2018
Merged

backport more aspects of vst2015 migration #7078

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
backport more aspects of vst2015 migration
  • Loading branch information
@dothebart
dothebart committed Oct 25, 2018
commit 3b4568a814bf83842e7068f97840ab32cd097943
89 changes: 46 additions & 43 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -786,6 +786,52 @@ if(ARANGODB_DEBUG_CMAKE)
message( STATUS "DirDefs: ${DirDefs}" )
endif()


################################################################################
## 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)

include_directories(${OPENSSL_INCLUDE_DIR})
add_definitions(-DARANGODB_OPENSSL_VERSION=\"${OPENSSL_VERSION}\")
add_definitions(-DOPENSSL_VERSION_MAJOR=${OPENSSL_VERSION_MAJOR})
add_definitions(-DOPENSSL_VERSION_MINOR=${OPENSSL_VERSION_MINOR})

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)
option(USE_OPENSSL_NO_SSL2
"do not use OPENSSL_NO_SSL2"
ON
)
else ()
option(USE_OPENSSL_NO_SSL2
"do not use OPENSSL_NO_SSL2"
OFF
)
endif ()
endif ()

if (USE_OPENSSL_NO_SSL2)
add_definitions(-DOPENSSL_NO_SSL2)
endif ()

################################################################################
## 3RD PARTY
################################################################################
Expand Down Expand Up @@ -843,49 +889,6 @@ endforeach()

include_directories(${ICU_INCLUDE_DIR})

################################################################################
## 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)

include_directories(${OPENSSL_INCLUDE_DIR})
add_definitions(-DARANGODB_OPENSSL_VERSION=\"${OPENSSL_VERSION}\")
add_definitions(-DOPENSSL_VERSION_MAJOR=${OPENSSL_VERSION_MAJOR})
add_definitions(-DOPENSSL_VERSION_MINOR=${OPENSSL_VERSION_MINOR})

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)
option(USE_OPENSSL_NO_SSL2
"do not use OPENSSL_NO_SSL2"
ON
)
else ()
option(USE_OPENSSL_NO_SSL2
"do not use OPENSSL_NO_SSL2"
OFF
)
endif ()
endif ()

if (USE_OPENSSL_NO_SSL2)
add_definitions(-DOPENSSL_NO_SSL2)
endif ()

################################################################################
## V8
Expand Down
1 change: 1 addition & 0 deletions Installation/Jenkins/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,7 @@ while [ $# -gt 0 ]; do
CONFIGURE_OPTIONS+=("v141,host=x64")
MAKE="cmake --build . --config ${BUILD_CONFIG}"
PACKAGE_MAKE="cmake --build . --config ${BUILD_CONFIG} --target"
CONFIGURE_OPTIONS+=("-DOPENSSL_USE_STATIC_LIBS=TRUE")
# MSVC doesn't know howto do our assembler in first place.
ARCH="-DUSE_OPTIMIZE_FOR_ARCHITECTURE=Off"
export _IsNativeEnvironment=true
Expand Down
0