X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a9c65b08e46ce0c97c9b50ce35a8b35eecddf51e..671132ab07e9adef92ac1ffc7f9527e504187084:/tools/cmake/GCCFlags.cmake diff --git a/tools/cmake/GCCFlags.cmake b/tools/cmake/GCCFlags.cmake index 82c286ec8f..5731bdac15 100644 --- a/tools/cmake/GCCFlags.cmake +++ b/tools/cmake/GCCFlags.cmake @@ -35,7 +35,7 @@ if(enable_compile_warnings) set(warnCXXFLAGS "${warnCXXFLAGS} -Wno-mismatched-tags -Wno-extern-c-compat") endif() - # the one specific to C but refused by C++ + # the one specific to C but refused by C++ set(warnCFLAGS "${warnCFLAGS} -Wmissing-prototypes") if(CMAKE_Fotran_COMPILER_ID MATCHES "GCC|PGI") @@ -76,7 +76,7 @@ endif() # Configure LTO # NOTE, cmake 3.0 has a INTERPROCEDURAL_OPTIMIZATION target # property for this (http://www.cmake.org/cmake/help/v3.0/prop_tgt/INTERPROCEDURAL_OPTIMIZATION.html) -if(enable_lto) # User wants LTO. Try if we can do that +if(enable_lto) # User wants LTO. Try if we can do that set(enable_lto OFF) if(enable_compile_optimizations AND CMAKE_COMPILER_IS_GNUCC @@ -166,12 +166,12 @@ if(enable_coverage) find_program(GCOV_PATH gcov) if(GCOV_PATH) set(COVERAGE_COMMAND "${GCOV_PATH}" CACHE TYPE FILEPATH FORCE) + set(COVERAGE_EXTRA_FLAGS "-l -p") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DCOVERAGE") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fprofile-arcs -ftest-coverage") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fprofile-arcs -ftest-coverage") set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fprofile-arcs -ftest-coverage") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage") - set(TESH_OPTION --enable-coverage) add_definitions(-fprofile-arcs -ftest-coverage) endif() endif() @@ -211,8 +211,8 @@ if(NOT $ENV{LDFLAGS} STREQUAL "") endif() if(MINGW) - # http://stackoverflow.com/questions/10452262/create-64-bit-jni-under-windows - # We don't want to ship libgcc_s_seh-1.dll nor libstdc++-6.dll + # http://stackoverflow.com/questions/10452262/create-64-bit-jni-under-windows + # We don't want to ship libgcc_s_seh-1.dll nor libstdc++-6.dll set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -static-libgcc") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libgcc -static-libstdc++") set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "${CMAKE_SHARED_LIBRARY_LINK_C_FLAGS} -static-libgcc")