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
let gdb have access to cpp sources
[simgrid.git]
/
buildtools
/
Cmake
/
Flags.cmake
diff --git
a/buildtools/Cmake/Flags.cmake
b/buildtools/Cmake/Flags.cmake
index
278388c
..
2bcceac
100644
(file)
--- a/
buildtools/Cmake/Flags.cmake
+++ b/
buildtools/Cmake/Flags.cmake
@@
-3,6
+3,7
@@
set(optCFLAGS "")
if(NOT __VISUALC__ AND NOT __BORLANDC__)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-g3")
if(NOT __VISUALC__ AND NOT __BORLANDC__)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-g3")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}-g3")
else(NOT __VISUALC__ AND NOT __BORLANDC__)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}/Zi")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}/Zi")
else(NOT __VISUALC__ AND NOT __BORLANDC__)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}/Zi")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}/Zi")
@@
-22,6
+23,11
@@
else(enable_compile_optimizations)
set(optCFLAGS "-O0 ")
endif(enable_compile_optimizations)
set(optCFLAGS "-O0 ")
endif(enable_compile_optimizations)
+if(APPLE AND COMPILER_C_VERSION_MAJOR_MINOR MATCHES "4.6")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-deprecated-declarations")
+ set(optCFLAGS "-O0 ")
+endif(APPLE AND COMPILER_C_VERSION_MAJOR_MINOR MATCHES "4.6")
+
if(NOT enable_debug)
set(CMAKE_C_FLAGS "-DNDEBUG ${CMAKE_C_FLAGS}")
endif(NOT enable_debug)
if(NOT enable_debug)
set(CMAKE_C_FLAGS "-DNDEBUG ${CMAKE_C_FLAGS}")
endif(NOT enable_debug)
@@
-29,6
+35,7
@@
endif(NOT enable_debug)
set(CMAKE_C_FLAGS "${optCFLAGS}${warnCFLAGS}${CMAKE_C_FLAGS}")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${custom_flags}")
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
if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
# Try to make Mac a bit more complient to open source standards
if(CMAKE_SYSTEM_NAME MATCHES "Darwin")