Comment the java stripping commands for now

[simgrid.git] / tools / cmake / Java.cmake

diff --git a/tools/cmake/Java.cmake b/tools/cmake/Java.cmake
index 5096792..275f1b3 100644 (file)
--- a/tools/cmake/Java.cmake
+++ b/tools/cmake/Java.cmake
@@ -4,7 +4,7 @@
 ##
 
 find_package(Java 1.7 COMPONENTS Runtime Development)
-if (not ${Java_FOUND})
+if (NOT ${Java_FOUND})
   message(FATAL_ERROR "Java not found (need at least Java7). Please install the JDK or disable that option")
 endif()
 set(Java_FOUND 1)
@@ -101,11 +101,14 @@ add_custom_command(
 ###
 
 if(enable_lib_in_jar)
-  find_program(STRIP_COMMAND strip)
-  mark_as_advanced(STRIP_COMMAND)
-  if(NOT STRIP_COMMAND)
-    set(STRIP_COMMAND "cmake -E echo (strip not found)")
-  endif()
+
+  # Stripping disabled for the time being to make Java debuggable. We should introduce a proper option for that.
+  #find_program(STRIP_COMMAND strip)
+  #mark_as_advanced(STRIP_COMMAND)
+  #if(NOT STRIP_COMMAND)
+  #  set(STRIP_COMMAND "cmake -E echo (strip not found)")
+  #endif()
+  
   set(SG_SYSTEM_NAME ${CMAKE_SYSTEM_NAME})
   
   if(${SG_SYSTEM_NAME} MATCHES "kFreeBSD")
@@ -138,11 +141,11 @@ if(enable_lib_in_jar)
     COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/lib/${LIBSIMGRID_JAVA_SO} ${JAVA_NATIVE_PATH}
     COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/lib/${LIBSURF_JAVA_SO}    ${JAVA_NATIVE_PATH}
     
-    # strip seems to fail on Mac on binaries that are already stripped.
-    # It then spits: "symbols referenced by indirect symbol table entries that can't be stripped"
-    COMMAND ${STRIP_COMMAND} ${JAVA_NATIVE_PATH}/${LIBSIMGRID_SO}      || true
-    COMMAND ${STRIP_COMMAND} ${JAVA_NATIVE_PATH}/${LIBSIMGRID_JAVA_SO} || true
-    COMMAND ${STRIP_COMMAND} ${JAVA_NATIVE_PATH}/${LIBSURF_JAVA_SO}    || true
+    ## strip seems to fail on Mac on binaries that are already stripped.
+    ## It then spits: "symbols referenced by indirect symbol table entries that can't be stripped"
+    #COMMAND ${STRIP_COMMAND} ${JAVA_NATIVE_PATH}/${LIBSIMGRID_SO}      || true
+    #COMMAND ${STRIP_COMMAND} ${JAVA_NATIVE_PATH}/${LIBSIMGRID_JAVA_SO} || true
+    #COMMAND ${STRIP_COMMAND} ${JAVA_NATIVE_PATH}/${LIBSURF_JAVA_SO}    || true
 
     COMMAND ${JAVA_ARCHIVE} -uvf ${SIMGRID_JAR}  NATIVE
     COMMAND ${CMAKE_COMMAND} -E remove_directory NATIVE