X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9fa79033d8728e656feb09c6c08e570dc8c256c9..0a6a4bd48476ef1840bdd773ac0683c4452bf416:/buildtools/Cmake/Flags.cmake

diff --git a/buildtools/Cmake/Flags.cmake b/buildtools/Cmake/Flags.cmake
index 16465a2f22..fc99b1ea18 100644
--- a/buildtools/Cmake/Flags.cmake
+++ b/buildtools/Cmake/Flags.cmake
@@ -1,14 +1,14 @@
 set(warnCFLAGS "")
 set(optCFLAGS "")
 
-if(NOT WIN32)
+if(NOT __VISUALC__ AND NOT __BORLANDC__)
 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-g3")
-endif(NOT WIN32)
+else(NOT __VISUALC__ AND NOT __BORLANDC__)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}/Zi")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}/Zi")
+endif(NOT __VISUALC__ AND NOT __BORLANDC__)
 
-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)
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${custom_flags}")
 
 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 ")
@@ -21,8 +21,12 @@ endif(enable_compile_optimizations)
 set(CMAKE_C_FLAGS "${optCFLAGS}${warnCFLAGS}${CMAKE_C_FLAGS}")
 
 if(enable_coverage)
-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fprofile-arcs -ftest-coverage")
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage")
-	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fprofile-arcs -ftest-coverage")
+	find_program(GCOV_PATH gcov)
+	if(GCOV_PATH)
+		SET(COVERAGE_COMMAND "${GCOV_PATH}" CACHE TYPE FILEPATH FORCE)
+		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fprofile-arcs -ftest-coverage")
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage")
+		add_definitions(-fprofile-arcs -ftest-coverage)
+		endif(GCOV_PATH)
 endif(enable_coverage)