bump our dependency on cmake and stop trying to survive older versions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 105c070..24e310d 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
-# Java requires 2.8.6
+cmake_minimum_required(VERSION 2.8.8)
 
 project(SimGrid C CXX)
 

diff --git a/tools/cmake/MakeJava.cmake b/tools/cmake/MakeJava.cmake
index bb01398..b7cca97 100644 (file)
--- a/tools/cmake/MakeJava.cmake
+++ b/tools/cmake/MakeJava.cmake
@@ -1,28 +1,19 @@
-cmake_minimum_required(VERSION 2.8.6)
-
 include(UseJava)
 
 # Rules to build libsimgrid-java
 #
 add_library(simgrid-java SHARED ${JMSG_C_SRC})
 set_target_properties(simgrid-java PROPERTIES VERSION ${libsimgrid-java_version})
-if (CMAKE_VERSION VERSION_LESS "2.8.8")
-  include_directories(${JNI_INCLUDE_DIRS})
-
-  message("[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)
+get_target_property(COMMON_INCLUDES simgrid-java INCLUDE_DIRECTORIES)
+if (COMMON_INCLUDES)
+  set_target_properties(simgrid-java PROPERTIES
+    INCLUDE_DIRECTORIES "${COMMON_INCLUDES};${JNI_INCLUDE_DIRS}")
 else()
-  get_target_property(COMMON_INCLUDES simgrid-java INCLUDE_DIRECTORIES)
-  if (COMMON_INCLUDES)
-    set_target_properties(simgrid-java PROPERTIES
-      INCLUDE_DIRECTORIES "${COMMON_INCLUDES};${JNI_INCLUDE_DIRS}")
-  else()
-    set_target_properties(simgrid-java PROPERTIES
-      INCLUDE_DIRECTORIES "${JNI_INCLUDE_DIRS}")
-  endif()
-
-  get_target_property(CHECK_INCLUDES simgrid-java INCLUDE_DIRECTORIES)
+  set_target_properties(simgrid-java PROPERTIES
+    INCLUDE_DIRECTORIES "${JNI_INCLUDE_DIRS}")
 endif()
+
+get_target_property(CHECK_INCLUDES simgrid-java INCLUDE_DIRECTORIES)
 message("-- [Java] simgrid-java includes: ${CHECK_INCLUDES}")
 
 target_link_libraries(simgrid-java simgrid)
@@ -75,12 +66,7 @@ endif()
 
 ## Here is how to build simgrid.jar
 ##
-if(CMAKE_VERSION VERSION_LESS "2.8.12")
-  set(CMAKE_JAVA_TARGET_OUTPUT_NAME simgrid)
-  add_jar(simgrid-java_pre_jar ${JMSG_JAVA_SRC})
-else()
-  add_jar(simgrid-java_pre_jar ${JMSG_JAVA_SRC} OUTPUT_NAME simgrid)
-endif()
+add_jar(simgrid-java_pre_jar ${JMSG_JAVA_SRC} OUTPUT_NAME simgrid)
 
 set(JAVA_BUNDLE "${CMAKE_HOME_DIRECTORY}/tools/cmake/Scripts/java_bundle.sh")
 set(JAVA_BUNDLE_SO_FILES