8000 backport more aspects of vst2015 migration (#7078) · arangodb/arangodb@f6309a4 · GitHub
[go: up one dir, main page]
Skip to content

Commit f6309a4

Browse files
dothebartjsteemann
dothebart
authored and
jsteemann
committed
backport more aspects of vst2015 migration (#7078)
1 parent d52fa24 commit f6309a4

File tree

2 files changed

+47
-43
lines changed

2 files changed

+47
-43
lines changed

‎CMakeLists.txt

Lines changed: 46 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -786,6 +786,52 @@ if(ARANGODB_DEBUG_CMAKE)
786786
message( STATUS "DirDefs: ${DirDefs}" )
787787
endif()
788788

789+
790+
################################################################################
791+
## OPENSSL
792+
################################################################################
793+
794+
# Some special stuff for Mac OSX and homebrew as a preparation for the
795+
# generic FindOpenSSL script:
796+
if (APPLE AND BREW AND NOT OPENSSL_ROOT_DIR)
797+
message("searching openssl with brew (${BREW})")
798+
# if we have a brew openssl, prefer it over the elderly system one.
799+
execute_process(OUTPUT_VARIABLE BREW_ROOT
800+
OUTPUT_STRIP_TRAILING_WHITESPACE
801+
COMMAND ${BREW} --prefix)
802+
set(OPENSSL_ROOT_DIR "${BREW_ROOT}/opt/openssl")
803+
message("auto-set OPENSSL_ROOT_DIR to: ${OPENSSL_ROOT_DIR}")
804+
endif ()
805+
806+
find_package(OpenSSL REQUIRED)
807+
808+
include_directories(${OPENSSL_INCLUDE_DIR})
809+
add_definitions(-DARANGODB_OPENSSL_VERSION=\"${OPENSSL_VERSION}\")
810+
add_definitions(-DOPENSSL_VERSION_MAJOR=${OPENSSL_VERSION_MAJOR})
811+
add_definitions(-DOPENSSL_VERSION_MINOR=${OPENSSL_VERSION_MINOR})
812+
813+
if (OPENSSL_VERSION)
814+
string(REPLACE "." ";" OPENSSL_VERSION_LIST ${OPENSSL_VERSION})
815+
list(GET OPENSSL_VERSION_LIST 0 OPENSSL_VERSION_MAJOR)
816+
list(GET OPENSSL_VERSION_LIST 1 OPENSSL_VERSION_MINOR)
817+
818+
if ("${OPENSSL_VERSION_MAJOR}" GREATER 0 AND "${OPENSSL_VERSION_MINOR}" GREATER 0)
819+
option(USE_OPENSSL_NO_SSL2
820+
"do not use OPENSSL_NO_SSL2"
821+
ON
822+
)
823+
else ()
824+
option(USE_OPENSSL_NO_SSL2
825+
"do not use OPENSSL_NO_SSL2"
826+
OFF
827+
)
828+
endif ()
829+
endif ()
830+
831+
if (USE_OPENSSL_NO_SSL2)
832+
add_definitions(-DOPENSSL_NO_SSL2)
833+
endif ()
834+
789835
################################################################################
790< 10000 code>836
## 3RD PARTY
791837
################################################################################
@@ -843,49 +889,6 @@ endforeach()
843889

844890
include_directories(${ICU_INCLUDE_DIR})
845891

846-
################################################################################
847-
## OPENSSL
848-
################################################################################
849-
850-
# Some special stuff for Mac OSX and homebrew as a preparation for the
851-
# generic FindOpenSSL script:
852-
if (APPLE AND BREW AND NOT OPENSSL_ROOT_DIR)
853-
message("searching openssl with brew (${BREW})")
854-
# if we have a brew openssl, prefer it over the elderly system one.
855-
execute_process(OUTPUT_VARIABLE BREW_ROOT
856-
OUTPUT_STRIP_TRAILING_WHITESPACE
857-
COMMAND ${BREW} --prefix)
858-
set(OPENSSL_ROOT_DIR "${BREW_ROOT}/opt/openssl")
859-
message("auto-set OPENSSL_ROOT_DIR to: ${OPENSSL_ROOT_DIR}")
860-
endif ()
861-
862-
find_package(OpenSSL REQUIRED)
863-
864-
include_directories(${OPENSSL_INCLUDE_DIR})
865-
add_definitions(-DARANGODB_OPENSSL_VERSION=\"${OPENSSL_VERSION}\")
866-
add_definitions(-DOPENSSL_VERSION_MAJOR=${OPENSSL_VERSION_MAJOR})
867-
add_definitions(-DOPENSSL_VERSION_MINOR=${OPENSSL_VERSION_MINOR})
868-
869-
if (OPENSSL_VERSION)
870-
string(REPLACE "." ";" OPENSSL_VERSION_LIST ${OPENSSL_VERSION})
871-
list(GET OPENSSL_VERSION_LIST 0 OPENSSL_VERSION_MAJOR)
872-
list(GET OPENSSL_VERSION_LIST 1 OPENSSL_VERSION_MINOR)
873-
if ("${OPENSSL_VERSION_MAJOR}" GREATER 0 AND "${OPENSSL_VERSION_MINOR}" GREATER 0)
874-
option(USE_OPENSSL_NO_SSL2
875-
"do not use OPENSSL_NO_SSL2"
876-
ON
877-
)
878-
else ()
879-
option(USE_OPENSSL_NO_SSL2
880-
"do not use OPENSSL_NO_SSL2"
881-
OFF
882-
)
883-
endif ()
884-
endif ()
885-
886-
if (USE_OPENSSL_NO_SSL2)
887-
add_definitions(-DOPENSSL_NO_SSL2)
888-
endif ()
889892

890893
################################################################################
891894
## V8

‎Installation/Jenkins/build.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,7 @@ while [ $# -gt 0 ]; do
271271
CONFIGURE_OPTIONS+=("v141,host=x64")
272272
MAKE="cmake --build . --config ${BUILD_CONFIG}"
273273
PACKAGE_MAKE="cmake --build . --config ${BUILD_CONFIG} --target"
274+
CONFIGURE_OPTIONS+=("-DOPENSSL_USE_STATIC_LIBS=TRUE")
274275
# MSVC doesn't know howto do our assembler in first place.
275276
ARCH="-DUSE_OPTIMIZE_FOR_ARCHITECTURE=Off"
276277
export _IsNativeEnvironment=true

0 commit comments

Comments
 (0)
0