Add more optimizations for MC builds.

diff --git a/tools/cmake/Flags.cmake b/tools/cmake/Flags.cmake
index 0a195ec..4d6b380 100644 (file)
--- a/tools/cmake/Flags.cmake
+++ b/tools/cmake/Flags.cmake
@@ -176,15 +176,20 @@ if(enable_model-checking AND enable_compile_optimizations)
   # Forget it, do not optimize the code (because it confuses the MC):
   set(optCFLAGS "-O0")
   # But you can still optimize this:
-  foreach(s
-      src/simix/popping.cpp src/simix/popping_generated.cpp src/simix/smx_global.cpp
-      ${SURF_SRC} ${TRACING_SRC} ${XBT_SRC}
-      ${MC_SRC_BASE} ${MC_SRC})
+  set(src_list ${simgrid_sources})
+  # except...
+  list(REMOVE_ITEM src_list ${SIMIX_SRC} ${S4U_SRC})
+  # but...
+  list(APPEND src_list
+    src/simix/popping.cpp
+    src/simix/popping_generated.cpp
+    src/simix/smx_global.cpp)
+  foreach(src ${src_list})
       set (mcCFLAGS "-O3 -funroll-loops -fno-strict-aliasing")
       if(CMAKE_COMPILER_IS_GNUCC)
         set (mcCFLAGS "${mcCFLAGS} -finline-functions")
       endif()
-      set_source_files_properties(${s} PROPERTIES COMPILE_FLAGS ${mcCFLAGS})
+      set_source_files_properties(${src} PROPERTIES COMPILE_FLAGS ${mcCFLAGS})
   endforeach()
 endif()