Remove cmake 'enable_tracing' option: was not doing anything

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 599581a..14baaa4 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1004,7 +1004,6 @@ message("")
 message("        Maintainer mode .............: ${enable_maintainer_mode}")
 message("        Documentation................: ${enable_documentation}")
 message("        Model checking ..............: ${HAVE_MC}")
-message("        Tracing mode ................: ${enable_tracing}")
 message("        Jedule  mode ................: ${enable_jedule}")
 message("        Graphviz mode ...............: ${HAVE_GRAPHVIZ}")
 message("        Sigc++ mode .................: ${SIMGRID_HAVE_LIBSIG}")

diff --git a/ChangeLog b/ChangeLog
index cfc9a41..daa5907 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,8 @@ SimGrid (3.13) UNRELEASED; urgency=low
         - SD_workstation_get_computation_time => amount / sg_host_speed()
    - In Java
       - VM.setBound(int load) is now VM.setBound(double bound) to meet the MSG semantics. Use VM.getSpeed()*load/100 for the legacy behavior.
+   - In CMake
+      - option enable_tracing was removed. It was not doing anything since a while.
 
  XML platforms:
  * Switch to platform v4 format.

diff --git a/doc/doxygen/install.doc b/doc/doxygen/install.doc
index bc070be..7de8335 100644 (file)
--- a/doc/doxygen/install.doc
+++ b/doc/doxygen/install.doc
@@ -191,10 +191,6 @@ accepts several options, as listed below.
       (the XML parsers and other related elements). Adds an extra
       dependency on flex and flexml.
 
-  @li <b>enable_tracing</b> (ON/OFF): disable this if you have issues
-      with the tracing module. But this module is now very stable and
-      you really should try to enjoy this beauty.
-
   @li <b>enable_smpi</b> (ON/OFF): disable this if you have issues
       with the module allowing to run MPI code on top of SimGrid. This
       module very stable, but if you really don't need it, you can

diff --git a/doc/doxygen/tracing.doc b/doc/doxygen/tracing.doc
index 7c11bda..d5f2d01 100644 (file)
--- a/doc/doxygen/tracing.doc
+++ b/doc/doxygen/tracing.doc
@@ -12,22 +12,6 @@ and analyze them. This part of the user manual explains how the
 tracing-related features can be enabled and used during the
 development of simulators using the SimGrid library.
 
-\section tracing_tracing_enabling Enabling using CMake
-
-With the sources of SimGrid, it is possible to enable the tracing
-using the parameter <b>-Denable_tracing=ON</b> when the cmake is
-executed.  The sections \ref instr_category_functions, \ref
-instr_mark_functions, and \ref instr_uservariables_functions describe
-all the functions available when this Cmake options is
-activated. These functions will have no effect if SimGrid is
-configured without this option (they are wiped-out by the
-C-preprocessor).
-
-\verbatim
-$ cmake -Denable_tracing=ON .
-$ make
-\endverbatim
-
 \section instr_category_functions Tracing categories functions
 
 The SimGrid library is instrumented so users can trace the platform

diff --git a/tools/cmake/Option.cmake b/tools/cmake/Option.cmake
index e34e4bb..c43b5e3 100644 (file)
--- a/tools/cmake/Option.cmake
+++ b/tools/cmake/Option.cmake
@@ -31,7 +31,6 @@ option(enable_java           "Whether the Java bindings are activated." off)
 option(enable_lib_in_jar     "Whether the native libraries are bundled in a Java jar file" on)
 
 option(enable_lua            "Whether the Lua bindings are activated." off)
-option(enable_tracing        "Tracing simulations for visualization." on)
 
 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_jedule         "Jedule output of SimDAG." off)

diff --git a/tools/jenkins/DynamicAnalysis.sh b/tools/jenkins/DynamicAnalysis.sh
index 095a474..ed65c7b 100755 (executable)
--- a/tools/jenkins/DynamicAnalysis.sh
+++ b/tools/jenkins/DynamicAnalysis.sh
@@ -47,7 +47,7 @@ cd $WORKSPACE/build
 ### Proceed with the tests
 ctest -D ExperimentalStart || true
 
-cmake -Denable_documentation=OFF -Denable_lua=OFF -Denable_tracing=ON \
+cmake -Denable_documentation=OFF -Denable_lua=OFF  \
       -Denable_compile_optimizations=OFF -Denable_compile_warnings=ON \
       -Denable_jedule=OFF -Denable_mallocators=OFF \
       -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=OFF -Denable_model-checking=OFF \
@@ -65,7 +65,7 @@ fi
 make clean
 ctest -D ExperimentalStart || true
 
-cmake -Denable_documentation=OFF -Denable_lua=ON -Denable_java=ON -Denable_tracing=ON \
+cmake -Denable_documentation=OFF -Denable_lua=ON -Denable_java=ON \
       -Denable_compile_optimizations=OFF -Denable_compile_warnings=ON \
       -Denable_jedule=ON -Denable_mallocators=ON \
       -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=ON -Denable_model-checking=ON \