From c4c10825965e8d64382ec4338340290c66ce233d Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Tue, 29 Jan 2019 22:00:18 +0100 Subject: [PATCH] Include cmake/Flags.cmake after DefinePackages. The former uses variables defined in the latter (e.g. MC_SRC). --- CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 50d67d50c0..b7a206200e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -504,11 +504,6 @@ else() 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 ############################################# @@ -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) +### 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 -- 2.20.1