Correction of compilation flags

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7675 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a8a8819..6f5f8f4 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ exec_program("rm ${Project_BINARY_DIR}/CTestTestfile.cmake" OUTPUT_VARIABLE rmok
 SET(CMAKE_LANGUAGE "Cxx")
 SET(PROJECT_NAME "Simgrid")
 SET(PROJECT_LABEL "Simgrid")
-
+set(CMAKE_C_FLAGS "" CACHE TYPE INTERNAL FORCE)
 set(release_version "3.4")
 set(libsimgrid_version "${release_version}")
 set(libgras_version "${release_version}")

diff --git a/buildtools/Cmake/src/CMakeFlags.txt b/buildtools/Cmake/src/CMakeFlags.txt
index ecb8bea..72fc89b 100644 (file)
--- a/buildtools/Cmake/src/CMakeFlags.txt
+++ b/buildtools/Cmake/src/CMakeFlags.txt
@@ -3,21 +3,18 @@ set(optCFLAGS "")
 
 set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS}-g3)
 
-if(supernovae)
-       set(enable_compile_warnings true)
-       set(enable_compile_optimizations true)
-endif(supernovae)
+if(enable_supernovae)
+       set(warnCFLAGS "-Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wpointer-arith -Wchar-subscripts -Wcomment -Wformat -Wwrite-strings -Wno-unused-function -Wno-unused-parameter -Wno-strict-aliasing -Wno-format-nonliteral -Werror ")
+       set(optCFLAGS "-O3 -finline-functions -funroll-loops -fno-strict-aliasing ")
+endif(enable_supernovae)
 
-if(CMAKE_C_COMPILER MATCHES "/usr/bin/gcc")
+if(enable_compile_warnings)
+       set(warnCFLAGS "-Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wpointer-arith -Wchar-subscripts -Wcomment -Wformat -Wwrite-strings -Wno-unused-function -Wno-unused-parameter -Wno-strict-aliasing -Wno-format-nonliteral -Werror ")
+endif(enable_compile_warnings)
 
-       if(enable_compile_warnings)
-               set(warnCFLAGS "-Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wpointer-arith -Wchar-subscripts -Wcomment -Wformat -Wwrite-strings -Wno-unused-function -Wno-unused-parameter -Wno-strict-aliasing -Wno-format-nonliteral -Werror ")
-       endif(enable_compile_warnings)
+if(enable_compile_optimizations)
+       set(optCFLAGS "-O3 -finline-functions -funroll-loops -fno-strict-aliasing ")
+endif(enable_compile_optimizations)
 
-       if(enable_compile_optimizations)
-               set(optCFLAGS "-O3 -finline-functions -funroll-loops -fno-strict-aliasing ")
-       endif(enable_compile_optimizations)
+set(CMAKE_C_FLAGS "${optCFLAGS}${warnCFLAGS}${CMAKE_C_FLAGS}")
 
-       set(CMAKE_C_FLAGS "${optCFLAGS}${warnCFLAGS}${CMAKE_C_FLAGS}")
-
-endif(CMAKE_C_COMPILER MATCHES "/usr/bin/gcc")