From 3fc410e7a7f6a4f69389d7d803300ca750b8a56b Mon Sep 17 00:00:00 2001 From: Andreas Suter Date: Tue, 13 Apr 2021 07:31:01 +0200 Subject: [PATCH] add missing Qt6 flag for the case the user wants to choose himself. --- CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2035931f..f88b3335 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,21 +15,21 @@ option(BMWlibs "build optional BMWlibs" OFF) option(BNMRlibs "build optional beta-NMR libs" OFF) option(qt_based_tools "try to install Qt based tools (musredit, musrWiz, musrStep, mupp)" ON) option(try_OpenMP "try to use OpenMP if available" ON) -# define qt_version with possible values 'auto' or version '3', '4', '5' +# define qt_version with possible values 'auto' or version '3', '4', '5', '6' set(qt_version AUTO CACHE STRING "provide a specific Qt version to be used.") -set_property(CACHE qt_version PROPERTY STRINGS AUTO 3 4 5) +set_property(CACHE qt_version PROPERTY STRINGS AUTO 3 4 5 6) #--- set a default build type if none was specified --------------------------- set(default_build_type "Release") - -if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) + +if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) message(STATUS "Setting build type to '${default_build_type}' as none was specified.") set(CMAKE_BUILD_TYPE "${default_build_type}" CACHE STRING "Choose the type of build." FORCE) # Set the possible values of build type for cmake-gui set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo") -endif() +endif () #--- perform some checks and generate the config.h ----------------------------