You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bb...@apache.org on 2018/03/29 11:27:34 UTC
mesos git commit: Removed forwarding of OpenSSL include dir.
Repository: mesos
Updated Branches:
refs/heads/master 5984cb725 -> c51e9b86a
Removed forwarding of OpenSSL include dir.
Setting 'OPENSSL_INCLUDE_DIR' doesn't provide enough information for
the 'FindOpenSSL' module to find library paths. Hence, nothing is gained
by forwarding this argument.
This reverts commit ab65fb3b6e9f675b39aed0a01e2fce92153d5ff8.
Review: https://reviews.apache.org/r/66354/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/c51e9b86
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/c51e9b86
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/c51e9b86
Branch: refs/heads/master
Commit: c51e9b86ad1f76932156f0a54704e72682d1881c
Parents: 5984cb7
Author: Jan Schlicht <ja...@mesosphere.io>
Authored: Thu Mar 29 13:21:59 2018 +0200
Committer: Benjamin Bannier <bb...@apache.org>
Committed: Thu Mar 29 13:26:45 2018 +0200
----------------------------------------------------------------------
3rdparty/CMakeLists.txt | 7 -------
1 file changed, 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/c51e9b86/3rdparty/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
index 89d3e86..2b63b58 100644
--- a/3rdparty/CMakeLists.txt
+++ b/3rdparty/CMakeLists.txt
@@ -141,13 +141,6 @@ 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