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
code simplification
[simgrid.git]
/
tools
/
cmake
/
GCCFlags.cmake
diff --git
a/tools/cmake/GCCFlags.cmake
b/tools/cmake/GCCFlags.cmake
index 11d5cafd439b469b6e452fb890f80059f97b4088..c5c38eed959df13ff28c3b0926f98b01c281d3bf 100644
(file)
--- a/
tools/cmake/GCCFlags.cmake
+++ b/
tools/cmake/GCCFlags.cmake
@@
-54,7
+54,7
@@
if(enable_lto) # User wants LTO. Try if we can do that
AND CMAKE_COMPILER_IS_GNUCC
AND (NOT enable_model-checking))
if(WIN32)
AND CMAKE_COMPILER_IS_GNUCC
AND (NOT enable_model-checking))
if(WIN32)
- if (C
OMPILER_C_VERSION_MAJOR_MINOR STR
GREATER "4.8")
+ if (C
MAKE_C_COMPILER_VERSION VERSION_
GREATER "4.8")
# On windows, we need 4.8 or higher to enable lto because of http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50293
#
# We are experiencing assertion failures even with 4.8 on MinGW.
# On windows, we need 4.8 or higher to enable lto because of http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50293
#
# We are experiencing assertion failures even with 4.8 on MinGW.
@@
-89,7
+89,7
@@
if(enable_lto) # User wants LTO, and it seems usable. Go for it
# these objects you have to use the gcc wrappers:
# gcc-ar, gcc-nm and gcc-ranlib."
if(${CMAKE_C_COMPILER_ID} STREQUAL "GNU"
# these objects you have to use the gcc wrappers:
# gcc-ar, gcc-nm and gcc-ranlib."
if(${CMAKE_C_COMPILER_ID} STREQUAL "GNU"
- AND C
OMPILER_C_VERSION_MAJOR_MINOR STR
GREATER "4.8")
+ AND C
MAKE_C_COMPILER_VERSION VERSION_
GREATER "4.8")
set (CMAKE_AR gcc-ar)
set (CMAKE_RANLIB gcc-ranlib)
endif()
set (CMAKE_AR gcc-ar)
set (CMAKE_RANLIB gcc-ranlib)
endif()
@@
-104,7
+104,7
@@
if(enable_model-checking AND enable_compile_optimizations)
src/xbt/log.c src/xbt/xbt_log_appender_file.c
src/xbt/xbt_log_layout_format.c src/xbt/xbt_log_layout_simple.c
src/xbt/dict.c src/xbt/dict_elm.c src/xbt/dict_multi.c src/xbt/dict_cursor.c
src/xbt/log.c src/xbt/xbt_log_appender_file.c
src/xbt/xbt_log_layout_format.c src/xbt/xbt_log_layout_simple.c
src/xbt/dict.c src/xbt/dict_elm.c src/xbt/dict_multi.c src/xbt/dict_cursor.c
- src/xbt/set.c
src/xbt/setset.c
+ src/xbt/set.c
src/xbt/dynar.c src/xbt/fifo.c src/xbt/heap.c src/xbt/swag.c
src/xbt/str.c src/xbt/strbuff.c src/xbt/snprintf.c
src/xbt/queue.c
src/xbt/dynar.c src/xbt/fifo.c src/xbt/heap.c src/xbt/swag.c
src/xbt/str.c src/xbt/strbuff.c src/xbt/snprintf.c
src/xbt/queue.c