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
Include cmake/Flags.cmake after DefinePackages.
[simgrid.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
50d67d5
..
b7a2062
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-504,11
+504,6
@@
else()
set(GIT_VERSION "none, release version")
endif()
set(GIT_VERSION "none, release version")
endif()
-### Setup gcc & clang flags
-if (NOT MSVC)
- include(${CMAKE_HOME_DIRECTORY}/tools/cmake/Flags.cmake)
-endif()
-
### Generate the required headers and scripts
#############################################
### Generate the required headers and scripts
#############################################
@@
-754,6
+749,11
@@
SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
### Define source packages for Libs
include(${CMAKE_HOME_DIRECTORY}/tools/cmake/DefinePackages.cmake)
### Define source packages for Libs
include(${CMAKE_HOME_DIRECTORY}/tools/cmake/DefinePackages.cmake)
+### Setup gcc & clang flags (include *after* DefinePackage.cmake)
+if (NOT MSVC)
+ include(${CMAKE_HOME_DIRECTORY}/tools/cmake/Flags.cmake)
+endif()
+
add_custom_target(tests COMMENT "Recompiling the tests")
### Build some Maintainer files
add_custom_target(tests COMMENT "Recompiling the tests")
### Build some Maintainer files