From d2e5c54d03e1a942d97bf9d42746e337169d2a31 Mon Sep 17 00:00:00 2001 From: navarrop Date: Tue, 15 Feb 2011 13:15:48 +0000 Subject: [PATCH] replace message FATAL by STATUS user can define JAVA_INCLUDE_PATH manually git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/contrib/trunk/simgrid-java@9624 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- FindJavaSG.cmake | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/FindJavaSG.cmake b/FindJavaSG.cmake index 4de80c50c4..70e8faaa1c 100644 --- a/FindJavaSG.cmake +++ b/FindJavaSG.cmake @@ -1,30 +1,34 @@ include(FindJava) include(FindJNI) -if(JAVA_COMPILE AND JAVA_INCLUDE_PATH) - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${JAVA_INCLUDE_PATH} ") -else(JAVA_COMPILE AND JAVA_INCLUDE_PATH) - message(FATAL_ERROR "Can't compile java!!!") -endif(JAVA_COMPILE AND JAVA_INCLUDE_PATH) - message(STATUS "Looking for jni.h") if(JAVA_INCLUDE_PATH) message(STATUS "Looking for jni.h - found") else(JAVA_INCLUDE_PATH) -message(STATUS "Looking for ljni.h - not found") +message(STATUS "Looking for jni.h - not found") endif(JAVA_INCLUDE_PATH) message(STATUS "Looking for jni_md.h") if(JAVA_INCLUDE_PATH2) message(STATUS "Looking for jni_md.h - found") else(JAVA_INCLUDE_PATH2) -message(STATUS "Looking for jni_md.h - found") +message(STATUS "Looking for jni_md.h - not found") endif(JAVA_INCLUDE_PATH2) if(JAVA_COMPILE) message(STATUS "Found javac: ${JAVA_COMPILE}") +else(JAVA_COMPILE) +message(FATAL_ERROR "Not found javac bin") endif(JAVA_COMPILE) if(JAVA_ARCHIVE) message(STATUS "Found jar: ${JAVA_ARCHIVE}") -endif(JAVA_ARCHIVE) \ No newline at end of file +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 -- 2.20.1