qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kp...@apache.org
Subject [qpid-interop-test] branch master updated: QPIDIT-139: Replacing workaround for for RHEL/CentOS 7 bug where Java_FOUND not being set correctly which was removed in last checkin.
Date Fri, 17 Jan 2020 20:20:04 GMT
This is an automated email from the ASF dual-hosted git repository.

kpvdr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-interop-test.git


The following commit(s) were added to refs/heads/master by this push:
     new 2f64059  QPIDIT-139: Replacing workaround for for RHEL/CentOS 7 bug where Java_FOUND
not being set correctly which was removed in last checkin.
2f64059 is described below

commit 2f64059af5258d8b358bd07acfd4b1def15dfbe6
Author: Kim van der Riet <kpvdr@apache.org>
AuthorDate: Fri Jan 17 15:19:44 2020 -0500

    QPIDIT-139: Replacing workaround for for RHEL/CentOS 7 bug where Java_FOUND not being
set correctly which was removed in last checkin.
---
 CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8cb607b..0622f31 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -71,9 +71,9 @@ find_python(python3 "PYTHON3_FOUND" "PYTHON3_VER" "PYTHON3_SITE_DIR_NAME")
 # Find Java
 
 find_package(Java 1.8 COMPONENTS Development)
+# if (NOT Java_FOUND)
 # RHEL7 bug: Java_FOUND is not being set, so workaround:
-#if (NOT DEFINED Java_JAVA_EXECUTABLE OR NOT DEFINED Java_JAVAC_EXECUTABLE OR NOT DEFINED
Java_JAR_EXECUTABLE)
-if (NOT Java_FOUND)
+if (NOT DEFINED Java_JAVA_EXECUTABLE OR NOT DEFINED Java_JAVAC_EXECUTABLE OR NOT DEFINED
Java_JAR_EXECUTABLE)
     message(STATUS "ERROR: Java compiler not found, but is required")
     set (ErrorFlag TRUE)
 endif ()


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message