diff options
| author | Kevin Wojniak <kainjow@users.noreply.github.com> | 2020-01-25 12:37:23 -0800 |
|---|---|---|
| committer | Jens Geyer <jensg@apache.org> | 2020-04-03 21:17:25 +0200 |
| commit | dbb95e438f90609c8bc70b6953f65e97afedbb1b (patch) | |
| tree | b8728bcc3bafcaf080a3ade0640b9fbf4452b5de /build | |
| parent | 102428d35da461aec0f3d8a513e4a21bb56ddb69 (diff) | |
| download | thrift-dbb95e438f90609c8bc70b6953f65e97afedbb1b.tar.gz | |
THRIFT-5076 Improve CMake OpenSSL usage
Client: c_glib
Patch: Kevin Wojniak
This closes #1994
Diffstat (limited to 'build')
| -rw-r--r-- | build/cmake/DefineOptions.cmake | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/build/cmake/DefineOptions.cmake b/build/cmake/DefineOptions.cmake index f85d2c644..8357160b1 100644 --- a/build/cmake/DefineOptions.cmake +++ b/build/cmake/DefineOptions.cmake @@ -73,9 +73,6 @@ if(WITH_CPP) find_package(Qt5 QUIET COMPONENTS Core Network) CMAKE_DEPENDENT_OPTION(WITH_QT5 "Build with Qt5 support" ON "Qt5_FOUND" OFF) - find_package(OpenSSL QUIET) - CMAKE_DEPENDENT_OPTION(WITH_OPENSSL "Build with OpenSSL support" ON - "OPENSSL_FOUND" OFF) endif() CMAKE_DEPENDENT_OPTION(BUILD_CPP "Build C++ library" ON "BUILD_LIBRARIES;WITH_CPP" OFF) @@ -88,6 +85,13 @@ endif() CMAKE_DEPENDENT_OPTION(BUILD_C_GLIB "Build C (GLib) library" ON "BUILD_LIBRARIES;WITH_C_GLIB;GLIB_FOUND" OFF) +# OpenSSL +if(WITH_CPP OR WITH_C_GLIB) + find_package(OpenSSL QUIET) + CMAKE_DEPENDENT_OPTION(WITH_OPENSSL "Build with OpenSSL support" ON + "OPENSSL_FOUND" OFF) +endif() + # Java option(WITH_JAVA "Build Java Thrift library" ON) if(ANDROID) @@ -170,6 +174,11 @@ message(STATUS " Build as3 library: ${BUILD_AS3}") MESSAGE_DEP(WITH_AS3 "Disabled by WITH_AS3=OFF") MESSAGE_DEP(HAVE_COMPC "Adobe Flex compc was not found - did you set env var FLEX_HOME?") message(STATUS) +message(STATUS " Build with OpenSSL: ${WITH_OPENSSL}") +if(WITH_OPENSSL) + message(STATUS " Version: ${OPENSSL_VERSION}") +endif() +message(STATUS) message(STATUS " Build C++ library: ${BUILD_CPP}") MESSAGE_DEP(WITH_CPP "Disabled by WITH_CPP=OFF") if (BUILD_CPP) |