Merge branch 'master' of git+ssh://scm.gforge.inria.fr/gitroot/simgrid/simgrid

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

diff --git a/tools/cmake/Option.cmake b/tools/cmake/Option.cmake
index 1b1acf6..28df01f 100644 (file)
--- a/tools/cmake/Option.cmake
+++ b/tools/cmake/Option.cmake
@@ -14,22 +14,10 @@ option(enable_compile_optimizations "Whether to produce efficient code for the S
 option(enable_documentation "Whether to produce documentation" on)
 option(enable_ns3    "Whether ns3 model is activated." off)
 option(enable_java   "Whether the Java bindings are activated." off)
-option(enable_scala  "Whether the Scala bindings are activated." off)
 option(enable_lua    "Whether the Lua bindings are activated." off)
 option(enable_compile_warnings "Whether compilation warnings should be turned into errors." off)
 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_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)
@@ -45,11 +33,10 @@ 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 (stripped down) native libraries are bundled in a Java jar file" off)
+option(enable_lib_in_jar "Whether the native libraries are bundled in a Java jar file" on)
 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)
 
 if(WIN32)
   option(enable_smpi "Whether SMPI in included in library." off)
@@ -60,10 +47,6 @@ else()
 endif()
 option(enable_smpi_ISP_testsuite "Whether the test suite from ISP should be built." off)
 
-if(enable_scala AND NOT enable_java)
-  message(WARNING "For using scala you must turn java on with this command:\ncmake -Denable_java=on .")
-endif()
-
 mark_as_advanced(HAVE_SSH)
 mark_as_advanced(HAVE_RSYNC)
 mark_as_advanced(BIBTEX2HTML_PATH)