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

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

diff --git a/tools/cmake/Option.cmake b/tools/cmake/Option.cmake
index 1116526..1b1acf6 100644 (file)
--- a/tools/cmake/Option.cmake
+++ b/tools/cmake/Option.cmake
@@ -9,9 +9,6 @@ else()
   set(CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Path where this project should be installed")
 endif()
 
-set(pipol_user ${pipol_user} CACHE INTERNAL "pipol_user" FORCE)
-mark_as_advanced(pipol_user)
-
 option(release "Whether Release Mode is activated (disable tests on experimental parts)" on)
 option(enable_compile_optimizations "Whether to produce efficient code for the SimGrid library" on)
 option(enable_documentation "Whether to produce documentation" on)
@@ -23,20 +20,33 @@ option(enable_compile_warnings "Whether compilation warnings should be turned in
 option(enable_maintainer_mode "Whether flex and flexml files should be rebuilt." off)
 option(enable_tracing "Tracing simulations for visualization." on)
 option(enable_latency_bound_tracking "" off)
-option(enable_coverage "Whether coverage should be enabled." off)
+
 option(enable_ust "Enable userspace static tracepoint (lttng-ust)." off)
+if(enable_sdt)
+  add_definitions(-DUSE_SDT)
+endif()
+  
 option(enable_sdt "Enable statically defined tracepoint (strace/systemtap)." off)
+if(enable_ust)
+  add_definitions(-DUSE_UST)
+endif()
+    
+option(enable_coverage "Whether coverage should be enabled." off)
 mark_as_advanced(enable_coverage)
+mark_as_advanced(enable_memcheck)
+
 option(enable_memcheck "Enable memcheck." off)
 option(enable_memcheck_xml "Enable memcheck with xml output." off)
-mark_as_advanced(enable_memcheck)
 mark_as_advanced(enable_memcheck_xml)
+
 option(enable_mallocators "Enable mallocators (disable only for debugging purpose)." on)
+
 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_static "" 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)
 option(enable_msg_deprecated "This option enables the use of deprecated MSG functions" off)
@@ -67,7 +77,6 @@ mark_as_advanced(DOXYGEN_PATH)
 mark_as_advanced(FIG2DEV_PATH)
 mark_as_advanced(FLEXML_EXE)
 mark_as_advanced(FLEX_EXE)
-mark_as_advanced(PERL_EXECUTABLE)
 mark_as_advanced(GCOV_PATH)
 mark_as_advanced(ICONV_PATH)
 mark_as_advanced(MAKE_PATH)