From 05dfd109520f2c93e599cd615774913f1e0a2d66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Magnus=20Hellstr=C3=B6mer?= Date: Sun, 8 Sep 2024 23:27:02 +0200 Subject: [PATCH] Show full Qt version in cmake --- cmake/define_definitions.cmake | 2 +- tests/catch/CMakeLists.txt | 2 +- tests/googlemock/CMakeLists.txt | 2 +- tests/googletest/CMakeLists.txt | 2 +- tests/qttest/CMakeLists.txt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmake/define_definitions.cmake b/cmake/define_definitions.cmake index 75b65ae38..03662f7ff 100644 --- a/cmake/define_definitions.cmake +++ b/cmake/define_definitions.cmake @@ -68,4 +68,4 @@ else() add_definitions(-DBUILD_WITHOUT_KF6) endif() message("QET_COMPONENTS :" ${QET_COMPONENTS}) -message("QT_VERSION_MAJOR :" ${QT_VERSION_MAJOR}) +message("Qt version :" ${Qt${QT_VERSION_MAJOR}_VERSION}) diff --git a/tests/catch/CMakeLists.txt b/tests/catch/CMakeLists.txt index 385aadec5..fb94de374 100644 --- a/tests/catch/CMakeLists.txt +++ b/tests/catch/CMakeLists.txt @@ -50,13 +50,13 @@ if(NOT DEFINED QT_VERSION_MAJOR) REQUIRED ) endif() -message(".. QT_VERSION_MAJOR :" ${QT_VERSION_MAJOR}) find_package( Qt${QT_VERSION_MAJOR} COMPONENTS ${QET_COMPONENTS} REQUIRED) + message(".. Qt version :" ${Qt${QT_VERSION_MAJOR}_VERSION}) Include(FetchContent) diff --git a/tests/googlemock/CMakeLists.txt b/tests/googlemock/CMakeLists.txt index 3fe7b24e5..7f5464729 100644 --- a/tests/googlemock/CMakeLists.txt +++ b/tests/googlemock/CMakeLists.txt @@ -50,13 +50,13 @@ if(NOT DEFINED QT_VERSION_MAJOR) REQUIRED ) endif() -message(".. QT_VERSION_MAJOR :" ${QT_VERSION_MAJOR}) find_package( Qt${QT_VERSION_MAJOR} COMPONENTS ${QET_COMPONENTS} REQUIRED) +message(".. Qt version :" ${Qt${QT_VERSION_MAJOR}_VERSION}) Include(FetchContent) diff --git a/tests/googletest/CMakeLists.txt b/tests/googletest/CMakeLists.txt index 240251800..7192b0b06 100644 --- a/tests/googletest/CMakeLists.txt +++ b/tests/googletest/CMakeLists.txt @@ -50,13 +50,13 @@ if(NOT DEFINED QT_VERSION_MAJOR) REQUIRED ) endif() -message(".. QT_VERSION_MAJOR :" ${QT_VERSION_MAJOR}) find_package( Qt${QT_VERSION_MAJOR} COMPONENTS ${QET_COMPONENTS} REQUIRED) + message(".. Qt version :" ${Qt${QT_VERSION_MAJOR}_VERSION}) Include(FetchContent) diff --git a/tests/qttest/CMakeLists.txt b/tests/qttest/CMakeLists.txt index 88e8981ea..79dec51a9 100644 --- a/tests/qttest/CMakeLists.txt +++ b/tests/qttest/CMakeLists.txt @@ -51,7 +51,6 @@ if(NOT DEFINED QT_VERSION_MAJOR) REQUIRED ) endif() -message(".. QT_VERSION_MAJOR :" ${QT_VERSION_MAJOR}) find_package( Qt${QT_VERSION_MAJOR} @@ -59,6 +58,7 @@ find_package( ${QET_COMPONENTS} Test REQUIRED) + message(".. Qt version :" ${Qt${QT_VERSION_MAJOR}_VERSION}) include(../../cmake/fetch_kdeaddons.cmake) include(../../cmake/fetch_singleapplication.cmake)