From b1b6e4d60b954f58d699cb1bb72b230606d52fc3 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Mon, 8 Feb 2016 01:34:55 +0100 Subject: [PATCH] we won't strip java: we are not robust enough, unfortunately --- tools/cmake/Java.cmake | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/tools/cmake/Java.cmake b/tools/cmake/Java.cmake index 7f09188ffa..6ddf53297b 100644 --- a/tools/cmake/Java.cmake +++ b/tools/cmake/Java.cmake @@ -106,12 +106,6 @@ endif() if(enable_lib_in_jar) - # 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}) @@ -139,11 +133,6 @@ if(enable_lib_in_jar) COMMAND ${CMAKE_COMMAND} -E remove_directory ${JAVA_NATIVE_PATH} COMMAND ${CMAKE_COMMAND} -E make_directory ${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 ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/lib/${LIBSIMGRID_SO} ${JAVA_NATIVE_PATH} COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/lib/${LIBSIMGRID_JAVA_SO} ${JAVA_NATIVE_PATH} # There is no way to disable the dependency of mingw-64 on that lib, unfortunately -- 2.20.1