Use of SIMGRID_LIB_PATH and not SIMGRID_LIB

[simgrid.git] / FindJavaSG.cmake

diff --git a/FindJavaSG.cmake b/FindJavaSG.cmake
index 70e8faa..92d254d 100644 (file)
--- a/FindJavaSG.cmake
+++ b/FindJavaSG.cmake
@@ -3,9 +3,15 @@ include(FindJNI)
        
 message(STATUS "Looking for jni.h")
 if(JAVA_INCLUDE_PATH)
-message(STATUS "Looking for jni.h - found")
+ message(STATUS "Looking for jni.h - found")
 else(JAVA_INCLUDE_PATH)
-message(STATUS "Looking for jni.h - not found")
+ message(STATUS "Looking for jni.h - not found")
+endif(JAVA_INCLUDE_PATH)
+if(JAVA_INCLUDE_PATH)
+       SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${JAVA_INCLUDE_PATH} ")
+       message(STATUS "Add flags -I${JAVA_INCLUDE_PATH}")
+else(JAVA_INCLUDE_PATH)
+       message(STATUS "Need to set JAVA_INCLUDE_PATH to jni.h")
 endif(JAVA_INCLUDE_PATH)
 
 message(STATUS "Looking for jni_md.h")
@@ -14,6 +20,12 @@ message(STATUS "Looking for jni_md.h - found")
 else(JAVA_INCLUDE_PATH2)
 message(STATUS "Looking for jni_md.h - not found")
 endif(JAVA_INCLUDE_PATH2)
+if(JAVA_INCLUDE_PATH2)
+if(NOT JAVA_INCLUDE_PATH STREQUAL JAVA_INCLUDE_PATH2)
+       SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${JAVA_INCLUDE_PATH2} ")
+       message(STATUS "Add flags -I${JAVA_INCLUDE_PATH2}")
+endif(NOT JAVA_INCLUDE_PATH STREQUAL JAVA_INCLUDE_PATH2)
+endif(JAVA_INCLUDE_PATH2)
 
 if(JAVA_COMPILE)
 message(STATUS "Found javac: ${JAVA_COMPILE}")
@@ -25,10 +37,4 @@ if(JAVA_ARCHIVE)
 message(STATUS "Found jar: ${JAVA_ARCHIVE}")
 else(JAVA_ARCHIVE)
 message(FATAL_ERROR "Not found jar bin")
-endif(JAVA_ARCHIVE)
-
-if(JAVA_INCLUDE_PATH)
-       SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${JAVA_INCLUDE_PATH} ")
-else(JAVA_INCLUDE_PATH)
-       message(STATUS "Need to set JAVA_INCLUDE_PATH to jni.h")
-endif(JAVA_INCLUDE_PATH)
\ No newline at end of file
+endif(JAVA_ARCHIVE)
\ No newline at end of file