X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d5da0b1cbb3bbd66e62160fe10d55046b1773b6e..6beeeabf25b17eda08b5ffc44bbc12c0e2bfb526:/tools/cmake/Java.cmake diff --git a/tools/cmake/Java.cmake b/tools/cmake/Java.cmake index 7bebd68289..333e2c66e1 100644 --- a/tools/cmake/Java.cmake +++ b/tools/cmake/Java.cmake @@ -94,6 +94,10 @@ add_custom_command( ### if(enable_lib_in_jar) + find_program(STRIP_COMMAND strip) + if(NOT STRIP_COMMAND) + set(STRIP_COMMAND "cmake -E echo (strip not found)") + endif() set(JAVA_NATIVE_PATH NATIVE/${CMAKE_SYSTEM_NAME}/${CMAKE_SYSTEM_PROCESSOR}) if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^i[3-6]86$") @@ -117,6 +121,9 @@ if(enable_lib_in_jar) 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} COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/lib/${LIBSURF_JAVA_SO} ${JAVA_NATIVE_PATH} + COMMAND ${STRIP_COMMAND} ${JAVA_NATIVE_PATH}/${LIBSIMGRID_SO} + COMMAND ${STRIP_COMMAND} ${JAVA_NATIVE_PATH}/${LIBSIMGRID_JAVA_SO} + COMMAND ${STRIP_COMMAND} ${JAVA_NATIVE_PATH}/${LIBSURF_JAVA_SO} COMMAND ${JAVA_ARCHIVE} -uvf ${SIMGRID_JAR} NATIVE COMMAND ${CMAKE_COMMAND} -E remove_directory NATIVE @@ -127,7 +134,7 @@ if(enable_lib_in_jar) if(MINGW) find_library(WINPTHREAD_DLL NAME winpthread winpthread-1 - PATHS C:\MinGW C:\MinGW64 C:\MinGW\bin C:\MinGW64\bin + PATHS C:\\MinGW C:\\MinGW64 C:\\MinGW\\bin C:\\MinGW64\\bin ) add_custom_command( TARGET simgrid-java_jar POST_BUILD