Try to support older versions of cmake.

[simgrid.git] / buildtools / Cmake / MakeJava.cmake

diff --git a/buildtools/Cmake/MakeJava.cmake b/buildtools/Cmake/MakeJava.cmake
index f9037de..a861c10 100644 (file)
--- 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)
@@ -83,6 +90,7 @@ add_custom_command(
           ${CMAKE_HOME_DIRECTORY}/COPYING
           ${CMAKE_HOME_DIRECTORY}/ChangeLog
           ${CMAKE_HOME_DIRECTORY}/ChangeLog.SimGrid-java
+          ${CMAKE_HOME_DIRECTORY}/LICENSE-LGPL-2.1
   COMMAND ${CMAKE_COMMAND} -E remove_directory "NATIVE"
   COMMAND ${CMAKE_COMMAND} -E make_directory "${JSG_BUNDLE}"
   COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_BINARY_DIR}/lib/${LIBSIMGRID_SO}" "${JSG_BUNDLE}"
@@ -92,6 +100,7 @@ add_custom_command(
   COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_HOME_DIRECTORY}/COPYING" "${JSG_BUNDLE}"
   COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_HOME_DIRECTORY}/ChangeLog" "${JSG_BUNDLE}"
   COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_HOME_DIRECTORY}/ChangeLog.SimGrid-java" "${JSG_BUNDLE}"
+  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_HOME_DIRECTORY}/LICENSE-LGPL-2.1" "${JSG_BUNDLE}"
   COMMAND ${JAVA_ARCHIVE} -uvmf ${MANIFEST_FILE} ${SIMGRID_JAR} "NATIVE"
   COMMAND ${CMAKE_COMMAND} -E remove ${SIMGRID_JAR}_finalized
   COMMAND ${CMAKE_COMMAND} -E touch ${SIMGRID_JAR}_finalized