--- CMakeLists.txt.orig 2023-03-08 16:08:22 UTC +++ CMakeLists.txt @@ -30,7 +30,7 @@ include(misc) # CMake modules set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake" "${CMAKE_CURRENT_SOURCE_DIR}/external/cmake-modules") include(misc) -include(GetGitRevisionDescription) +#include(GetGitRevisionDescription) # C++ set(CMAKE_CXX_STANDARD 17) @@ -40,14 +40,14 @@ set(VERSION_SUFFIX "-git-" CACHE STRING "") set(VERSION_NAKED ${PROJECT_VERSION}) set(VERSION_SUFFIX "-git-" CACHE STRING "") -if (VERSION_SUFFIX STREQUAL "-git-") +if (FALSE AND VERSION_SUFFIX STREQUAL "-git-") git_describe(GIT_DESC --tags) if ( NOT ${GIT_DESC} MATCHES ".*NOTFOUND" ) set(PROJECT_VERSION ${GIT_DESC}) endif() -elseif(VERSION_SUFFIX MATCHES "^\\..*") +elseif(FALSE AND VERSION_SUFFIX MATCHES "^\\..*") set(PROJECT_VERSION "${PROJECT_VERSION}${VERSION_SUFFIX}") -elseif(NOT VERSION_SUFFIX STREQUAL "") +elseif(FALSE AND NOT VERSION_SUFFIX STREQUAL "") set(PROJECT_VERSION "${PROJECT_VERSION}+${VERSION_SUFFIX}") endif() @@ -90,8 +90,15 @@ endif() # Qt #find_package(Qt5Qml QUIET) -set(QT_VERSION_MAJOR 5) -find_package(QT NAMES Qt5 Qt6 COMPONENTS Core QUIET) +option(WITH_QT5 "Build against Qt5" ON) +option(WITH_QT6 "Build against Qt6" OFF) +if ( WITH_QT5 ) + set(QT_VERSION_MAJOR 5) +endif() +if ( WITH_QT6 ) + set(QT_VERSION_MAJOR 6) +endif() +find_package(QT NAMES Qt${QT_VERSION_MAJOR} COMPONENTS Core QUIET) find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Widgets Xml UiTools Concurrent Network Svg REQUIRED) message(STATUS "Using Qt ${QT_VERSION_MAJOR}")