From 10c4f4163f149e4431833a4d03d3b2eb73d53d6e Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Sun, 30 Jun 2019 09:59:29 +0200 Subject: [PATCH] Move constants to the top of the CMake file --- CMakeLists.txt | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6adbda862..a494ed9fa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,6 +4,13 @@ project(QGroundControl LANGUAGES CXX) set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug;Release;RelWithDebInfo;MinSizeRel;Coverage") +set(CMAKE_CXX_STANDARD 14) +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTOUIC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_INCLUDE_CURRENT_DIR ON) + + # CMake build type # Debug Release RelWithDebInfo MinSizeRel Coverage if (NOT CMAKE_BUILD_TYPE) @@ -70,12 +77,6 @@ add_definitions( message(STATUS "QGroundControl version: ${git_tag}") -set(CMAKE_CXX_STANDARD 14) -set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTOUIC ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_INCLUDE_CURRENT_DIR ON) - #============================================================================= # ccache # -- 2.22.0