cp is cp, but sh may be sh.exe

diff --git a/tools/cmake/Java.cmake b/tools/cmake/Java.cmake
index 6d1e43f..5004500 100644 (file)
--- a/tools/cmake/Java.cmake
+++ b/tools/cmake/Java.cmake
@@ -128,9 +128,9 @@ if(enable_lib_in_jar)
   endif()
 
   # Find how to copy
   endif()
 
   # Find how to copy

-  set(CPEXE cp)
+  set(SHEXE sh)

   if(WIN32)
   if(WIN32)

-    set(CPEXE cp.exe)
+    set(SHEXE sh.exe)

   endif()
 
   # Find what to copy
   endif()
 
   # Find what to copy


@@ -158,7 +158,7 @@ if(enable_lib_in_jar)
     COMMAND ${CMAKE_COMMAND} -E remove_directory ${JAVA_NATIVE_PATH}
     COMMAND ${CMAKE_COMMAND} -E make_directory   ${JAVA_NATIVE_PATH}
     
     COMMAND ${CMAKE_COMMAND} -E remove_directory ${JAVA_NATIVE_PATH}
     COMMAND ${CMAKE_COMMAND} -E make_directory   ${JAVA_NATIVE_PATH}
     

-    COMMAND echo ${CPEXE} ${JAVALIBS} ${JAVA_NATIVE_PATH} # Just display what's going on
+    COMMAND echo cp ${JAVALIBS} ${JAVA_NATIVE_PATH} # Just display what's going on

     # So, first of all, I'm sorry for the next few lines. Here is what's going on.
     # I need to copy some files, depending on the environment. 
     # I cannot use several POST_BUILD commands because cmake does
     # So, first of all, I'm sorry for the next few lines. Here is what's going on.
     # I need to copy some files, depending on the environment. 
     # I cannot use several POST_BUILD commands because cmake does


@@ -169,7 +169,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.
     # 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 "${CPEXE} ${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"
     
     ## 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"