From: navarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Wed, 16 Feb 2011 14:06:54 +0000 (+0000)
Subject: Need to add -I<path_to_jni_md.h> if it is != to -I<path_to_jni.h>
X-Git-Tag: v3_9_90~569^2~19^2~205
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/9818edb4eec024e1b268a398b3b5fa192dbc8f52?ds=sidebyside

Need to add -I<path_to_jni_md.h> if it is != to -I<path_to_jni.h>

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/contrib/trunk/simgrid-java@9641 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/FindJavaSG.cmake b/FindJavaSG.cmake
index 70e8faaa1c..11e6323007 100644
--- a/FindJavaSG.cmake
+++ b/FindJavaSG.cmake
@@ -7,6 +7,12 @@ message(STATUS "Looking for jni.h - found")
 else(JAVA_INCLUDE_PATH)
 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")
 if(JAVA_INCLUDE_PATH2)
@@ -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