From 930aee4aca2cf2faaa7f129940e8b5cb1a844371 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Fri, 31 May 2013 15:29:50 +0200 Subject: [PATCH] Try to support older versions of cmake. --- buildtools/Cmake/MakeJava.cmake | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/buildtools/Cmake/MakeJava.cmake b/buildtools/Cmake/MakeJava.cmake index 116b62e7c3..a861c109fc 100644 --- a/buildtools/Cmake/MakeJava.cmake +++ b/buildtools/Cmake/MakeJava.cmake @@ -6,17 +6,24 @@ 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) -if (COMMON_INCLUDES) - set_target_properties(SG_java PROPERTIES - INCLUDE_DIRECTORIES "${COMMON_INCLUDES};${JNI_INCLUDE_DIRS}") +if (CMAKE_VERSION VERSION_LESS "2.8.8") + include_directories(${JNI_INCLUDE_DIRS}) + + message(WARNING "[Java] Try to workaround missing feature in older CMake. You should better update CMake to version 2.8.8 or above.") + get_directory_property(CHECK_INCLUDES INCLUDE_DIRECTORIES) else() - set_target_properties(SG_java PROPERTIES - INCLUDE_DIRECTORIES "${JNI_INCLUDE_DIRS}") -endif() -add_dependencies(SG_java simgrid) + get_target_property(COMMON_INCLUDES SG_java INCLUDE_DIRECTORIES) + 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) + get_target_property(CHECK_INCLUDES SG_java INCLUDE_DIRECTORIES) +endif() message("-- [Java] SG_java includes: ${CHECK_INCLUDES}") if(WIN32) -- 2.20.1