do not include libboost-context in the jar

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

diff --git a/tools/cmake/Java.cmake b/tools/cmake/Java.cmake
index 87b0527..613272c 100644 (file)
--- a/tools/cmake/Java.cmake
+++ b/tools/cmake/Java.cmake
@@ -127,11 +127,14 @@ if(enable_lib_in_jar)
     set(JAVA_NATIVE_PATH NATIVE/${SG_SYSTEM_NAME}/arm) # Default arm (soft-float ABI)
   endif()
 
+  # Find how to copy
+  set(SHEXE sh)
+  if(WIN32)
+    set(SHEXE sh.exe)
+  endif()
+
   # Find what to copy
   set(JAVALIBS ${CMAKE_BINARY_DIR}/lib/${LIBSIMGRID_SO} ${CMAKE_BINARY_DIR}/lib/${LIBSIMGRID_JAVA_SO})
-  if (HAVE_BOOST_CONTEXT)
-    set(JAVALIBS ${JAVALIBS} ${Boost_CONTEXT_LIBRARY_RELEASE})
-  endif()
   if(MINGW)
     find_library(WINPTHREAD_DLL
       NAME winpthread winpthread-1
@@ -163,7 +166,7 @@ if(enable_lib_in_jar)
     # But if I do so, cmake still passes the space-separated list as a single argument to cp.
     # So I have to fire a sh -c, just to correctly parse the cp parameters.
     # Yup. That's the ways it goes. cmake is so lovely, that's wonderful.
-    COMMAND sh -c "cp ${JAVALIBS} ${JAVA_NATIVE_PATH}" # cp is less portable, but cmake cannot copy several files at once
+    COMMAND ${SHEXE} -c "cp ${JAVALIBS} ${JAVA_NATIVE_PATH}" # cp is less portable, but cmake cannot copy several files at once
     
     ## 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"