Add first "implementation" of k-subsets iterator

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

diff --git a/tools/cmake/Flags.cmake b/tools/cmake/Flags.cmake
index 2c71772f11cbb7a2d404f2bc339fd68e3e487086..f90b2b40e85f4db8b8d873a5990cd85e43dad3fc 100644 (file)
--- a/tools/cmake/Flags.cmake
+++ b/tools/cmake/Flags.cmake
@@ -14,7 +14,7 @@ set(optCFLAGS "")
 set(warnCXXFLAGS "")
 
 if(enable_compile_warnings)
-  set(warnCFLAGS "-fno-common -Wall -Wextra -Wunused -Wmissing-declarations -Wpointer-arith -Wwrite-strings -Wno-unused-function -Wno-unused-parameter -Wno-strict-aliasing")
+  set(warnCFLAGS "-fno-common -Wall -Wextra -Wunused -Wmissing-declarations -Wpointer-arith -Wwrite-strings -Wno-unused-function -Wno-unused-local-typedefs -Wno-unused-parameter -Wno-strict-aliasing")
 
   if (CMAKE_CXX_COMPILER_ID MATCHES "Intel")
     # ignore remarks:
@@ -32,7 +32,7 @@ if(enable_compile_warnings)
   set(warnCXXFLAGS "${warnCFLAGS}")
 
   if(CMAKE_COMPILER_IS_GNUCC)
-    set(warnCFLAGS "${warnCFLAGS} -Wclobbered -Wformat-signedness -Wno-error=clobbered -Wno-unused-local-typedefs -Wno-error=attributes -Wno-error=maybe-uninitialized")
+    set(warnCFLAGS "${warnCFLAGS} -Wclobbered -Wformat-signedness -Wno-error=clobbered -Wno-error=attributes -Wno-error=maybe-uninitialized")
   endif()
 
   if(CMAKE_COMPILER_IS_GNUCXX)
@@ -104,14 +104,12 @@ endif()
 
 # Do not leak the current directory into the binaries
 if(CMAKE_COMPILER_IS_GNUCC AND NOT enable_coverage)
-  execute_process(COMMAND realpath --relative-to=${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}
-    RESULT_VARIABLE RESULT OUTPUT_VARIABLE RELATIVE_SOURCE_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
-  if(RESULT EQUAL 0)
-    message(STATUS "Relative source directory is \"${RELATIVE_SOURCE_DIR}\".")
-  else()
-    message(WARNING "Failed to find relative source directory. Using \".\".")
-    set(RELATIVE_SOURCE_DIR ".")
+  if (CMAKE_VERSION VERSION_LESS "3.20")
+    file(RELATIVE_PATH RELATIVE_SOURCE_DIR ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR})
+  else() # cmake >= 3.20
+    cmake_path(RELATIVE_PATH CMAKE_SOURCE_DIR BASE_DIRECTORY ${CMAKE_BINARY_DIR} OUTPUT_VARIABLE RELATIVE_SOURCE_DIR)
   endif()
+  message(STATUS "Relative source directory is \"${RELATIVE_SOURCE_DIR}\".")
   if (CMAKE_C_COMPILER_VERSION VERSION_LESS "8.0")
     set(optCFLAGS "${optCFLAGS} -fdebug-prefix-map=\"${CMAKE_SOURCE_DIR}=${RELATIVE_SOURCE_DIR}\"")
   else()
@@ -188,10 +186,10 @@ if(enable_model-checking AND enable_compile_optimizations)
   # But you can still optimize this:
   set(src_list ${simgrid_sources})
   # except...
-  list(REMOVE_ITEM src_list ${SIMIX_SRC} ${S4U_SRC})
-  # but...
-  list(APPEND src_list
-    src/kernel/actor/Simcall.cpp)
+  list(FILTER src_list EXCLUDE REGEX "^src/kernel/activity/")
+  list(FILTER src_list EXCLUDE REGEX "^src/kernel/actor/")
+  list(FILTER src_list EXCLUDE REGEX "^src/kernel/context/")
+  list(FILTER src_list EXCLUDE REGEX "^src/s4u/")
   foreach(src ${src_list})
       set (mcCFLAGS "-O3 -funroll-loops -fno-strict-aliasing")
       if(CMAKE_COMPILER_IS_GNUCC)
@@ -220,11 +218,6 @@ if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_XOPEN_SOURCE=700 -D_DARWIN_C_SOURCE")
 endif()
 
-# Avoid a failure seen with gcc 7.2.0 and ns3 3.27
-if(enable_ns3)
-  set_source_files_properties(src/surf/network_ns3.cpp PROPERTIES COMPILE_FLAGS " -Wno-unused-local-typedef")
-endif()
-
 set(TESH_OPTION "")
 if(enable_coverage)
   find_program(GCOV_PATH NAMES ENV{GCOV} gcov)