From ae0cfab091ed10f75140fba00545b6816bd0abd6 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Wed, 30 Jan 2019 08:21:20 +0100 Subject: [PATCH] Our cmake files are so fragile, fix last changes. --- CMakeLists.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b7a206200e..7703477800 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -504,6 +504,14 @@ else() set(GIT_VERSION "none, release version") endif() +### Define source packages for Libs +include(${CMAKE_HOME_DIRECTORY}/tools/cmake/DefinePackages.cmake) + +### Setup gcc & clang flags (include after DefinePackage.cmake, and before generating header files) +if (NOT MSVC) + include(${CMAKE_HOME_DIRECTORY}/tools/cmake/Flags.cmake) +endif() + ### Generate the required headers and scripts ############################################# @@ -746,14 +754,6 @@ endif() SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${generated_files_to_clean}") -### 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