kudu git commit: [build] fix OPENSSL_ROOT_DIR override on RH/CentOS

[al...@apache.org]

Repository: kudu
Updated Branches:
  refs/heads/master c08f27fc5 -> 9f85f04a9


[build] fix OPENSSL_ROOT_DIR override on RH/CentOS

Due to an extra level of indirection in the condition for one if()
expression, the OpenSSL location was not overridden on RedHat/CentOS
machines where the OpenSSL workaround build existed in
$KUDU_ROOT/thirdparty/installed/openssl-el6-workaround,
even if the OPENSSL_ROOT_DIR was overridden for cmake invocation
(i.e. -DOPENSSL_ROOT_DIR=/path/to/alt-openssl-location was specified).

Removing the level of indirection for the OPENSSL_ROOT_DIR variable
in the expression fixed the issue, which seems to be in sync with
  https://cmake.org/cmake/help/v3.9/command/if.html

At least, with this patch the issue is gone if running cmake 3.9.0.

Change-Id: Ibe69b5d62ef4054e60138a154a85569d92166aff
Reviewed-on: http://gerrit.cloudera.org:8080/8407
Tested-by: Alexey Serbin <as...@cloudera.com>
Reviewed-by: Todd Lipcon <to...@apache.org>


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

Branch: refs/heads/master
Commit: 9f85f04a91c38229649ccb4aa4773a45fc742dc3
Parents: c08f27f
Author: Alexey Serbin <as...@cloudera.com>
Authored: Fri Oct 27 14:58:55 2017 -0700
Committer: Alexey Serbin <as...@cloudera.com>
Committed: Mon Oct 30 19:33:07 2017 +0000

----------------------------------------------------------------------
 CMakeLists.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kudu/blob/9f85f04a/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7e1350c..59542cf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -912,8 +912,7 @@ ADD_THIRDPARTY_LIB(mustache
 ## binary in thirdparty (deposited there by thirdparty/install-openssl-el6-workaround.sh)
 ## then we'll use that one. See that script for more information.
 set(CENTOS_6_4_OPENSSL_DIR "${THIRDPARTY_INSTALL_DIR}/openssl-el6-workaround/usr/")
-if (NOT "${OPENSSL_ROOT_DIR}" AND
-    EXISTS "${CENTOS_6_4_OPENSSL_DIR}")
+if (NOT OPENSSL_ROOT_DIR AND EXISTS "${CENTOS_6_4_OPENSSL_DIR}")
   set(OPENSSL_ROOT_DIR "${CENTOS_6_4_OPENSSL_DIR}")
 endif()
 find_package(OpenSSL 1.0.0 REQUIRED)