[cmake/java] copy all native libs in one shot to fix parallel build

[simgrid.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 045a76dc8968f5c88d3636f736ecbbb7e5ce99b7..ae5f9c6df8a5c66f3e2d38e24add49c661a51031 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -268,29 +268,23 @@ else()
   endif()
 endif()
 
-# Try again to see if we have libboost-context, 
-# but only if the lib is not embeeded in the jar file to reduce the dependencies from the Java point of view
-if(enable_lib_in_jar)
-  message("   (do not check for boost-context as you are building a full jarfile)")
-  set(HAVE_BOOST_CONTEXT 0)
-else()
-  find_package(Boost 1.42 COMPONENTS context)
-  set(Boost_FOUND 1) # We don't care of whether this component is missing
-
-  if(Boost_FOUND AND Boost_CONTEXT_FOUND)
-    # We should use feature detection for this instead:
-    if (Boost_VERSION LESS 105600)
-      message("Found Boost.Context API v1")
-      set(HAVE_BOOST_CONTEXT 1)
-    else()
-      message("Found Boost.Context API v2")
-      set(HAVE_BOOST_CONTEXT 2)
-    endif()
+# Try again to see if we have libboost-context
+find_package(Boost 1.42 COMPONENTS context)
+set(Boost_FOUND 1) # We don't care of whether this component is missing
+
+if(Boost_FOUND AND Boost_CONTEXT_FOUND)
+  # We should use feature detection for this instead:
+  if (Boost_VERSION LESS 105600)
+    message("Found Boost.Context API v1")
+    set(HAVE_BOOST_CONTEXT 1)
   else()
-    message ("   boost        : found.")
-    message ("   boost-context: missing. Install libboost-context-dev for this optional feature.")
-    set(HAVE_BOOST_CONTEXT 0)
+    message("Found Boost.Context API v2")
+    set(HAVE_BOOST_CONTEXT 2)
   endif()
+else()
+  message ("   boost        : found.")
+  message ("   boost-context: missing. Install libboost-context-dev for this optional feature.")
+  set(HAVE_BOOST_CONTEXT 0)
 endif()
 
 # Checks for header libraries functions.
@@ -1186,7 +1180,7 @@ else()
   find_program(WGET_PROGRAM  NAMES wget)
   message(STATUS "wget: ${WGET_PROGRAM}")
   if(WGET_PROGRAM)
-    ADD_CUSTOM_TARGET(simgrid_documentation
+    ADD_CUSTOM_TARGET(documentation
       COMMENT "Downloading the SimGrid documentation..."
       COMMAND ${WGET_PROGRAM} -r -np -nH -nd http://simgrid.gforge.inria.fr/simgrid/${release_version}/doc/
       WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc/html