Add 2 tesh files for new stuff and make them part of the testsuite

[simgrid.git] / buildtools / Cmake / Flags.cmake

diff --git a/buildtools/Cmake/Flags.cmake b/buildtools/Cmake/Flags.cmake
index a87ec9e..e6d51d3 100644 (file)
--- a/buildtools/Cmake/Flags.cmake
+++ b/buildtools/Cmake/Flags.cmake
@@ -20,9 +20,9 @@ endif(enable_compile_warnings)
 
 if(enable_compile_optimizations)
        set(optCFLAGS "-O3 -finline-functions -funroll-loops -fno-strict-aliasing ")
-       if(${COMPILER_C_VERSION_MAJOR_MINOR} STRGREATER "4.5")
+       if(COMPILER_C_VERSION_MAJOR_MINOR STRGREATER "4.5")
            set(optCFLAGS "${optCFLAGS}-flto ")
-       endif(${COMPILER_C_VERSION_MAJOR_MINOR} STRGREATER "4.5")
+       endif(COMPILER_C_VERSION_MAJOR_MINOR STRGREATER "4.5")
 else(enable_compile_optimizations)
         set(optCFLAGS "-O0 ")
 endif(enable_compile_optimizations)
@@ -33,12 +33,15 @@ if(APPLE AND COMPILER_C_VERSION_MAJOR_MINOR MATCHES "4.6")
 endif(APPLE AND COMPILER_C_VERSION_MAJOR_MINOR MATCHES "4.6")
 
 if(NOT enable_debug)
-               set(CMAKE_C_FLAGS "-DNDEBUG ${CMAKE_C_FLAGS}")
+    set(CMAKE_C_FLAGS "-DNDEBUG ${CMAKE_C_FLAGS}")
 endif(NOT enable_debug)
 
+if(enable_msg_deprecated)
+    set(CMAKE_C_FLAGS "-DMSG_USE_DEPRECATED ${CMAKE_C_FLAGS}")
+endif(enable_msg_deprecated)
+
 set(CMAKE_C_FLAGS "${optCFLAGS}${warnCFLAGS}${CMAKE_C_FLAGS}")
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${custom_flags}")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${optCFLAGS}")
 
 # Try to make Mac a bit more complient to open source standards
@@ -58,3 +61,16 @@ if(enable_coverage)
        endif(GCOV_PATH)
 endif(enable_coverage)
 
+if(NOT $ENV{CFLAGS} STREQUAL "")
+    message(STATUS "Add CFLAGS: \"$ENV{CFLAGS}\" to CMAKE_C_FLAGS")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} $ENV{CFLAGS}")
+endif(NOT $ENV{CFLAGS} STREQUAL "")
+
+if(NOT $ENV{LDFLAGS} STREQUAL "")
+    message(STATUS "Add LDFLAGS: \"$ENV{LDFLAGS}\" to CMAKE_C_LINK_FLAGS")
+    set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} $ENV{LDFLAGS}")
+endif(NOT $ENV{LDFLAGS} STREQUAL "")
+
+if(enable_model-checking AND enable_compile_optimizations)
+    message(WARNING "Sorry for now GCC optimizations does not work with model checking.\nPlease turn off optimizations with command:\ncmake -Denable_compile_optimizations=off. ")
+endif(enable_model-checking AND enable_compile_optimizations)