A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NDEBUG was not used on C++ files when enable_debug was set to 0
[simgrid.git]
/
buildtools
/
Cmake
/
Flags.cmake
diff --git
a/buildtools/Cmake/Flags.cmake
b/buildtools/Cmake/Flags.cmake
index
8bd04f6
..
b5ea03d
100644
(file)
--- a/
buildtools/Cmake/Flags.cmake
+++ b/
buildtools/Cmake/Flags.cmake
@@
-17,9
+17,13
@@
if(enable_compile_warnings)
if(COMPILER_C_VERSION_MAJOR_MINOR STRGREATER "4.5")
set(warnCFLAGS "${warnCFLAGS}-Wno-error=unused-but-set-variable ")
endif()
if(COMPILER_C_VERSION_MAJOR_MINOR STRGREATER "4.5")
set(warnCFLAGS "${warnCFLAGS}-Wno-error=unused-but-set-variable ")
endif()
+ if(COMPILER_C_VERSION_MAJOR_MINOR STREQUAL "4.6")
+ #some old compilers emit bogus warnings here, see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=45978 . Avoid failing the build in this case
+ set(warnCFLAGS "${warnCFLAGS}-Wno-error=array-bounds")
+ endif()
endif()
endif()
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra
-Wno-unused-function -Wno-unused-parameter -Wno-strict-aliasing
-Wno-format-nonliteral -Werror")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra
-Wunused -Wpointer-arith -Wchar-subscripts -Wcomment -Wno-unknown-warning-option -Wformat -Wwrite-strings -Wno-unused-function -Wno-unused-parameter -Wno-strict-aliasing -Wclobbered -Wno-error=clobbered
-Wno-format-nonliteral -Werror")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -Wall") # FIXME: Q&D hack
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -Wall") # FIXME: Q&D hack
@@
-50,14
+54,25
@@
if(enable_model-checking AND enable_compile_optimizations)
set(optCFLAGS "-O0 ")
# But you can still optimize this:
foreach(s
set(optCFLAGS "-O0 ")
# But you can still optimize this:
foreach(s
+ # src/xbt/mmalloc/mm.c
+ # src/xbt/snprintf.c src/xbt/log.c
+ # src/xbt/dynar.c
+ # src/xbt/set.c src/xbt/setset.c
+ # src/xbt/backtrace_linux.c
+ src/mc/mc_dwarf_expression.c src/mc/mc_dwarf.c src/mc/mc_member.c
src/mc/mc_snapshot.c src/mc/mc_page_store.cpp src/mc/mc_page_snapshot.cpp
src/mc/mc_snapshot.c src/mc/mc_page_store.cpp src/mc/mc_page_snapshot.cpp
- src/mc/mc_compare.c src/mc/mc_diff.c
+ src/mc/mc_compare.c
pp
src/mc/mc_diff.c
src/mc/mc_dwarf.c src/mc/mc_dwarf_attrnames.h src/mc/mc_dwarf_expression.c src/mc/mc_dwarf_tagnames.h
src/mc/mc_set.cpp)
set_source_files_properties(${s} PROPERTIES COMPILE_FLAGS "-O3 -finline-functions -funroll-loops -fno-strict-aliasing")
endforeach()
endif()
src/mc/mc_dwarf.c src/mc/mc_dwarf_attrnames.h src/mc/mc_dwarf_expression.c src/mc/mc_dwarf_tagnames.h
src/mc/mc_set.cpp)
set_source_files_properties(${s} PROPERTIES COMPILE_FLAGS "-O3 -finline-functions -funroll-loops -fno-strict-aliasing")
endforeach()
endif()
+if(enable_mc_content_adressable_pages)
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DMC_PAGE_STORE_MD4")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMC_PAGE_STORE_MD4")
+endif()
+
if(APPLE AND COMPILER_C_VERSION_MAJOR_MINOR MATCHES "4.6")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-deprecated-declarations")
set(optCFLAGS "-O0 ")
if(APPLE AND COMPILER_C_VERSION_MAJOR_MINOR MATCHES "4.6")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-deprecated-declarations")
set(optCFLAGS "-O0 ")
@@
-65,13
+80,14
@@
endif()
if(NOT enable_debug)
set(CMAKE_C_FLAGS "-DNDEBUG ${CMAKE_C_FLAGS}")
if(NOT enable_debug)
set(CMAKE_C_FLAGS "-DNDEBUG ${CMAKE_C_FLAGS}")
+ set(CMAKE_CXX_FLAGS "-DNDEBUG ${CMAKE_CXX_FLAGS}")
endif()
if(enable_msg_deprecated)
set(CMAKE_C_FLAGS "-DMSG_USE_DEPRECATED ${CMAKE_C_FLAGS}")
endif()
endif()
if(enable_msg_deprecated)
set(CMAKE_C_FLAGS "-DMSG_USE_DEPRECATED ${CMAKE_C_FLAGS}")
endif()
-set(CMAKE_C_FLAGS "${optCFLAGS}
${warnCFLAGS}
${CMAKE_C_FLAGS}")
+set(CMAKE_C_FLAGS "${optCFLAGS}
${warnCFLAGS}
${CMAKE_C_FLAGS}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${optCFLAGS}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${optCFLAGS}")