You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by cm...@apache.org on 2021/03/31 00:07:01 UTC

[qpid-interop-test] 32/41: QPIDIT-139: Replacing workaround for for RHEL/CentOS 7 bug where Java_FOUND not being set correctly which was removed in last checkin.

This is an automated email from the ASF dual-hosted git repository.

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

commit 2f64059af5258d8b358bd07acfd4b1def15dfbe6
Author: Kim van der Riet <kp...@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