mesos-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bbann...@apache.org
Subject mesos git commit: Added 'OPENSSL_INCLUDE_DIR' to forwarded arguments.
Date Wed, 28 Mar 2018 14:32:28 GMT
Repository: mesos
Updated Branches:
  refs/heads/master 21e4b45b3 -> ab65fb3b6


Added 'OPENSSL_INCLUDE_DIR' to forwarded arguments.

To help third-party dependencies find and build with OpenSSL, certain
options are forwarded to them. Dependencies using the 'FindOpenSSL'
module need either 'OPENSSL_ROOT_DIR' or 'OPENSSL_INCLUDE_DIR' to figure
out the location of OpenSSL. In the module 'OPENSSL_ROOT_DIR' acts as a
hint for 'OPENSSL_INCLUDE_DIR'. I.e., 'OPENSSL_INCLUDE_DIR' will be set
by the module. As a consequence, if 'OPENSSL_ROOT_DIR' is not configured
in 'ccmake', users will only be prompted to provide
'OPENSSL_INCLUDE_DIR'. By forwarding 'OPENSSL_INCLUDE_DIR' we cover this
case for third-party dependencies, thus allowing users to configure the
project in 'ccmake' without having to explicitly set 'OPENSSL_ROOT_DIR'.

Review: https://reviews.apache.org/r/66330/


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/ab65fb3b
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/ab65fb3b
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/ab65fb3b

Branch: refs/heads/master
Commit: ab65fb3b6e9f675b39aed0a01e2fce92153d5ff8
Parents: 21e4b45
Author: Jan Schlicht <jan@mesosphere.io>
Authored: Wed Mar 28 15:31:09 2018 +0200
Committer: Benjamin Bannier <bbannier@apache.org>
Committed: Wed Mar 28 15:31:09 2018 +0200

----------------------------------------------------------------------
 3rdparty/CMakeLists.txt | 7 +++++++
 1 file changed, 7 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/ab65fb3b/3rdparty/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
index 2b63b58..89d3e86 100644
--- a/3rdparty/CMakeLists.txt
+++ b/3rdparty/CMakeLists.txt
@@ -141,6 +141,13 @@ if (ENABLE_SSL)
     list(APPEND CMAKE_SSL_FORWARD_ARGS
       -DOPENSSL_MSVC_STATIC_RT=${OPENSSL_MSVC_STATIC_RT})
   endif ()
+
+  # Setting this but not setting 'OPENSSL_ROOT_DIR' still provides enough
+  # information for the `FindOpenSSL` module to find the OpenSSL libraries.
+  if (OPENSSL_INCLUDE_DIR)
+    list(APPEND CMAKE_SSL_FORWARD_ARGS
+      -DOPENSSL_INCLUDE_DIR=${OPENSSL_INCLUDE_DIR})
+  endif ()
 endif ()
 
 # This function works around a CMake issue with setting include directories of


Mime
View raw message