From 6e15d1ea806ea40ba6183c9ff57f58d8675df3c3 Mon Sep 17 00:00:00 2001 From: Michal Cmarada Date: Tue, 12 Feb 2019 19:25:04 +0100 Subject: enable setting of JAVA_HOME for cmake Change-Id: I4ce9e8527f33d4dc5e63496ac72acc7b69c4f4bc Signed-off-by: Michal Cmarada --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3b81f72..de66d85 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -93,10 +93,10 @@ macro(subdirlist dirlist dirpath) endforeach () endmacro() -#list(APPEND dirlist $ENV{JAVA_HOME}) -#subdirlist(dirlist /usr/lib/jvm) -#subdirlist(dirlist /usr/lib64/jvm) -# +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) -- cgit 1.2.3-korg