[cmake] recompile with swig if the executable is found

It used to be controled by the maintainer_mode option, but this is
stupid. That option should die (along with flexml, probably).

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d80201a..c5f5292 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -242,11 +242,14 @@ if(enable_java)
   find_package(JNI REQUIRED)
   message("-- [Java] JNI found: ${JNI_FOUND}")
   message("-- [Java] JNI include dirs: ${JNI_INCLUDE_DIRS}")
-  if(enable_maintainer_mode)
-    find_package(SWIG REQUIRED)
+  find_package(SWIG)
+  if(SWIG_FOUND)
     include(UseSWIG)
-    message("-- [Java] Swig found: ${SWIG_FOUND} (version ${SWIG_VERSION})")
+    message("-- [Java] Swig found: version ${SWIG_VERSION}")
+  else()
+    message("-- [Java] Swig NOT FOUND. Surf java bindings won't get refreshed. That's fine unless you work on this part yourself.")
   endif()
+  mark_as_advanced(SWIG_EXECUTABLE)
   set(HAVE_Java 1)
 endif()
 if(enable_scala)

diff --git a/tools/cmake/Java.cmake b/tools/cmake/Java.cmake
index df1ba3d..71d4b85 100644 (file)
--- a/tools/cmake/Java.cmake
+++ b/tools/cmake/Java.cmake
@@ -154,7 +154,7 @@ endif(enable_lib_in_jar)
 
 include_directories(${JNI_INCLUDE_DIRS} ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
 
-if(enable_maintainer_mode)
+if(SWIG_FOUND)
   set(CMAKE_SWIG_FLAGS "-package" "org.simgrid.surf")
   set(CMAKE_SWIG_OUTDIR "${CMAKE_HOME_DIRECTORY}/src/bindings/java/org/simgrid/surf")