From: Martin Quinson <martin.quinson@loria.fr>
Date: Fri, 4 Dec 2015 20:26:55 +0000 (+0100)
Subject: When the lib is embeeded in jar, don't use boost_context
X-Git-Tag: v3_13~1486
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/dc4df97acbdb945c9e9a7ace0cf0b4829a14d49b?ds=inline

When the lib is embeeded in jar, don't use boost_context

This fix #38.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dff73aab7d..045a76dc89 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -268,23 +268,29 @@ else()
   endif()
 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)
+# 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()
   else()
-    message("Found Boost.Context API v2")
-    set(HAVE_BOOST_CONTEXT 2)
+    message ("   boost        : found.")
+    message ("   boost-context: missing. Install libboost-context-dev for this optional feature.")
+    set(HAVE_BOOST_CONTEXT 0)
   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.
diff --git a/tools/cmake/Option.cmake b/tools/cmake/Option.cmake
index 393d2468f0..1b1acf6c79 100644
--- a/tools/cmake/Option.cmake
+++ b/tools/cmake/Option.cmake
@@ -45,7 +45,7 @@ option(enable_print_message "Enable print message during config." off)
 mark_as_advanced(enable_print_message)
 
 option(enable_model-checking "Turn this on to experiment with our prototype of model-checker (hinders the simulation's performance even if turned off at runtime)" off)
-option(enable_lib_in_jar "Whether the native libraries are bundled in a Java jar file" on)
+option(enable_lib_in_jar "Whether the (stripped down) native libraries are bundled in a Java jar file" off)
 option(enable_lto "Whether we should try to activate the LTO (link time optimisation)" on)
 option(enable_jedule "Jedule output of SimDAG." off)
 option(enable_debug "Turn this off to remove all debug messages at compile time (faster, but no debug activatable)" on)