From 340d4109389e7d6e2b5dc85c114bf07650c2bc34 Mon Sep 17 00:00:00 2001
From: Michal Cmarada <mcmarada@cisco.com>
Date: Tue, 12 Feb 2019 19:31:25 +0100
Subject: fix set jni path automatically for JAVA

Change-Id: I525e7004eecfd21d597f0bf6fbc968f4c1a6faa8
Signed-off-by: Michal Cmarada <mcmarada@cisco.com>
---
 CMakeLists.txt | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index de66d85..a58d788 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -97,14 +97,14 @@ list(APPEND dirlist $ENV{JAVA_HOME})
 subdirlist(dirlist /usr/lib/jvm)
 subdirlist(dirlist /usr/lib64/jvm)
 
-#unset(JAVA_HOME_SET)
-#find_path(JAVA_HOME_SET NAMES include/jni.h PATHS ${dirlist})
-#if (NOT JAVA_HOME_SET)
-#  message("JAVA_HOME is not found")
-#else()
-#  message("JAVA HOME: ${JAVA_HOME}")
-#  set(ENV{JAVA_HOME} "${JAVA_HOME_SET}")
-#endif()
+unset(JAVA_HOME_SET)
+find_path(JAVA_HOME_SET NAMES include/jni.h PATHS ${dirlist})
+if (NOT JAVA_HOME_SET)
+  message("JAVA_HOME is not found")
+else()
+  message("JAVA HOME: ${JAVA_HOME}")
+  set(ENV{JAVA_HOME} "${JAVA_HOME_SET}")
+endif()
 
 message("\nJAVA:")
 message("    JAVA_HOME: $ENV{JAVA_HOME}")
-- 
cgit 1.2.3-korg