From f632a205b7929ecfd367fcd2d787c65ab676da90 Mon Sep 17 00:00:00 2001
From: Arnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Date: Wed, 13 Feb 2013 18:14:22 +0100
Subject: [PATCH] Check if INCLUDE_DIRECTORIES were found.

---
 buildtools/Cmake/CompleteInFiles.cmake |  5 ++---
 buildtools/Cmake/MakeJava.cmake        | 13 +++++++++----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake
index 6edf2413e1..a5bec10a88 100644
--- a/buildtools/Cmake/CompleteInFiles.cmake
+++ b/buildtools/Cmake/CompleteInFiles.cmake
@@ -85,9 +85,8 @@ endif()
 if(enable_java)
   find_package(Java REQUIRED COMPONENTS Runtime Development)
   find_package(JNI REQUIRED)
-  message("JNI_FOUND        = ${JNI_FOUND}")
-  message("JNI_INCLUDE_DIRS = ${JNI_INCLUDE_DIRS}")
-  message("JNI_LIBRARIES    = ${JNI_LIBRARIES}")
+  message("-- [Java] JNI found: ${JNI_FOUND}")
+  message("-- [Java] JNI include dirs: ${JNI_INCLUDE_DIRS}")
   set(HAVE_Java 1)
 endif()
 if(enable_lua)
diff --git a/buildtools/Cmake/MakeJava.cmake b/buildtools/Cmake/MakeJava.cmake
index 954b0a171a..f9037de250 100644
--- a/buildtools/Cmake/MakeJava.cmake
+++ b/buildtools/Cmake/MakeJava.cmake
@@ -7,12 +7,17 @@ include(UseJava)
 add_library(SG_java SHARED ${JMSG_C_SRC})
 set_target_properties(SG_java PROPERTIES VERSION ${libSG_java_version})
 get_target_property(COMMON_INCLUDES SG_java INCLUDE_DIRECTORIES)
-set_target_properties(SG_java PROPERTIES
-  INCLUDE_DIRECTORIES "${COMMON_INCLUDES};${JNI_INCLUDE_DIRS}")
+if (COMMON_INCLUDES)
+  set_target_properties(SG_java PROPERTIES
+    INCLUDE_DIRECTORIES "${COMMON_INCLUDES};${JNI_INCLUDE_DIRS}")
+else()
+  set_target_properties(SG_java PROPERTIES
+    INCLUDE_DIRECTORIES "${JNI_INCLUDE_DIRS}")
+endif()
 add_dependencies(SG_java simgrid)
 
 get_target_property(CHECK_INCLUDES SG_java INCLUDE_DIRECTORIES)
-message("SG_java includes = ${CHECK_INCLUDES}")
+message("-- [Java] SG_java includes: ${CHECK_INCLUDES}")
 
 if(WIN32)
   get_target_property(SIMGRID_LIB_NAME_NAME SG_java LIBRARY_OUTPUT_NAME)
@@ -53,7 +58,7 @@ else()
   message(WARNING "Unknown system type. Processor: ${CMAKE_SYSTEM_PROCESSOR}; System: ${CMAKE_SYSTEM_NAME}")
   set(JSG_BUNDLE "NATIVE/${CMAKE_SYSTEM_NAME}/${CMAKE_SYSTEM_PROCESSOR/")
 endif()
-message("Native libraries bundled into: ${JSG_BUNDLE}")
+message("-- [Java] Native libraries bundled into: ${JSG_BUNDLE}")
 
 ## Don't strip libraries if not in release mode
 ##
-- 
2.20.1