diff --git a/CMakeLists.txt b/CMakeLists.txt index cef135c7fc23543e45d82437a96b002900fee381..2b5f11345f863dcc84994261da7bce168da3004f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -450,6 +450,8 @@ endif() # OpenSSL # +option(OPENSSL_USE_STATIC_LIBS "Link OpenSSL statically" + ${BUILD_STATIC}) set(ENABLE_BUNDLED_OPENSSL_DEFAULT OFF) if(BUILD_STATIC_WITH_BUNDLED_LIBS AND OPENSSL_USE_STATIC_LIBS) set(ENABLE_BUNDLED_OPENSSL_DEFAULT ON) @@ -850,6 +852,7 @@ set(options PACKAGE VERSION BUILD C_COMPILER CXX_COMPILER C_FLAGS CXX_FLAGS ENABLE_DOC ENABLE_DIST ENABLE_BUNDLED_ZLIB + OPENSSL_USE_STATIC_LIBS ENABLE_BUNDLED_OPENSSL ENABLE_BUNDLED_LIBCURL BUNDLED_LIBCURL_USE_ARES diff --git a/static-build/cmake/AddTarantoolProject.cmake b/static-build/cmake/AddTarantoolProject.cmake index cd52881930e37f8ced616d083876aef0b92a39c8..afd7f093b678dc372b8836a1c7e962824fe54303 100644 --- a/static-build/cmake/AddTarantoolProject.cmake +++ b/static-build/cmake/AddTarantoolProject.cmake @@ -9,7 +9,6 @@ ExternalProject_Add(tarantool # https://cmake.org/cmake/help/v3.4/module/GNUInstallDirs.html#special-cases -DCMAKE_INSTALL_LOCALSTATEDIR=<INSTALL_DIR>/var -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> - -DOPENSSL_USE_STATIC_LIBS=TRUE -DBUILD_STATIC_WITH_BUNDLED_LIBS=TRUE -DENABLE_DIST=TRUE -DENABLE_HARDENING=${ENABLE_HARDENING}