From 44a5d25f16b447295b6e3ef5a97f9bcd7cef0bde Mon Sep 17 00:00:00 2001 From: Marcus Tillmanns Date: Tue, 10 May 2022 16:06:58 +0200 Subject: [PATCH] CMake: add defaults from environment for PCH and Tests Change-Id: I7881c483f8c6f35463cff70ee1dbe91f2e6f810b Reviewed-by: Cristian Adam Reviewed-by: Reviewed-by: Eike Ziller --- CMakeLists.txt | 8 ++++++-- cmake/Utils.cmake | 7 +++++++ 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 cmake/Utils.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index ab4820ab55a..a4195eb781b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,8 +2,12 @@ cmake_minimum_required(VERSION 3.16) ## Add paths to check for cmake modules: list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") +include(Utils) -option(BUILD_WITH_PCH "Build with precompiled headers" ON) +env_with_default("QTC_BUILD_WITH_PCH" ENV_QTC_BUILD_WITH_PCH ON) +env_with_default("QTC_WITH_TESTS" ENV_QTC_WITH_TESTS OFF) + +option(BUILD_WITH_PCH "Build with precompiled headers" "${ENV_QTC_BUILD_WITH_PCH}") include(FeatureSummary) include(QtCreatorIDEBranding RESULT_VARIABLE IDE_BRANDING_FILE) @@ -29,7 +33,7 @@ qtc_handle_compiler_cache_support() option(BUILD_LINK_WITH_QT "Link with Qt from the parent Qt Creator" OFF) qtc_link_with_qt() -option(WITH_TESTS "Build Tests" OFF) +option(WITH_TESTS "Build Tests" ${ENV_QTC_WITH_TESTS}) add_feature_info("Build tests" ${WITH_TESTS} "") option(WITH_DEBUG_CMAKE "Enabled CMake project debugging functionality" OFF) option(SHOW_BUILD_DATE "Show build date in about dialog" OFF) diff --git a/cmake/Utils.cmake b/cmake/Utils.cmake new file mode 100644 index 00000000000..0b0670b267f --- /dev/null +++ b/cmake/Utils.cmake @@ -0,0 +1,7 @@ +function (env_with_default envName varToSet default) + if(DEFINED ENV{${envName}}) + set(${varToSet} $ENV{${envName}} PARENT_SCOPE) + else() + set(${varToSet} ${default} PARENT_SCOPE) + endif() +endfunction()