kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-20 16:20:52 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Force Qt6 in cmake

Browse Source
This commit is contained in:
Magnus Hellströmer
2024-09-10 22:23:46 +02:00
parent c77eb98a15
commit 9fefc7aa2a
5 changed files with 9 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/define_definitions.cmake
View File

@@ -68,7 +68,7 @@ else()
add_definitions(-DBUILD_WITHOUT_KF6) add_definitions(-DBUILD_WITHOUT_KF6)
endif() endif()
message("QET_COMPONENTS :" ${QET_COMPONENTS}) message("QET_COMPONENTS :" ${QET_COMPONENTS})
message("Qt version :" ${Qt${QT_VERSION_MAJOR}_VERSION}) message("Qt version :" ${Qt6_VERSION})
if(QMFILES_AS_RESOURCE) if(QMFILES_AS_RESOURCE)
add_definitions(-DQMFILES_AS_RESOURCE) add_definitions(-DQMFILES_AS_RESOURCE)

19
tests/catch/CMakeLists.txt
View File

@@ -40,23 +40,8 @@ if(NOT DEFINED QET_COMPONENTS)
message(".. QET_COMPONENTS is not set !!! I set them up !!!") message(".. QET_COMPONENTS is not set !!! I set them up !!!")
include(../../cmake/qet_compilation_vars.cmake) include(../../cmake/qet_compilation_vars.cmake)
endif() endif()
if(NOT DEFINED QT_VERSION_MAJOR) find_package(Qt6 REQUIRED COMPONENTS ${QET_COMPONENTS})
find_package( message(".. Qt version :" ${Qt6_VERSION})
QT
NAMES
Qt6
COMPONENTS
${QET_COMPONENTS}
REQUIRED
)
endif()
find_package(
Qt${QT_VERSION_MAJOR}
COMPONENTS
${QET_COMPONENTS}
REQUIRED)
message(".. Qt version :" ${Qt${QT_VERSION_MAJOR}_VERSION})
Include(FetchContent) Include(FetchContent)

19
tests/googlemock/CMakeLists.txt
View File

@@ -40,23 +40,8 @@ if(NOT DEFINED QET_COMPONENTS)
message(".. QET_COMPONENTS is not set !!! I set them up !!!") message(".. QET_COMPONENTS is not set !!! I set them up !!!")
include(../../cmake/qet_compilation_vars.cmake) include(../../cmake/qet_compilation_vars.cmake)
endif() endif()
if(NOT DEFINED QT_VERSION_MAJOR) find_package(Qt6 REQUIRED COMPONENTS ${QET_COMPONENTS})
find_package( message(".. Qt version :" ${Qt6_VERSION})
QT
NAMES
Qt6
COMPONENTS
${QET_COMPONENTS}
REQUIRED
)
endif()
find_package(
Qt${QT_VERSION_MAJOR}
COMPONENTS
${QET_COMPONENTS}
REQUIRED)
message(".. Qt version :" ${Qt${QT_VERSION_MAJOR}_VERSION})
Include(FetchContent) Include(FetchContent)

19
tests/googletest/CMakeLists.txt
View File

@@ -40,23 +40,8 @@ if(NOT DEFINED QET_COMPONENTS)
message(".. QET_COMPONENTS is not set !!! I set them up !!!") message(".. QET_COMPONENTS is not set !!! I set them up !!!")
include(../../cmake/qet_compilation_vars.cmake) include(../../cmake/qet_compilation_vars.cmake)
endif() endif()
if(NOT DEFINED QT_VERSION_MAJOR) find_package(Qt6 REQUIRED COMPONENTS ${QET_COMPONENTS})
find_package( message(".. Qt version :" ${Qt6_VERSION})
QT
NAMES
Qt6
COMPONENTS
${QET_COMPONENTS}
REQUIRED
)
endif()
find_package(
Qt${QT_VERSION_MAJOR}
COMPONENTS
${QET_COMPONENTS}
REQUIRED)
message(".. Qt version :" ${Qt${QT_VERSION_MAJOR}_VERSION})
Include(FetchContent) Include(FetchContent)

21
tests/qttest/CMakeLists.txt
View File

@@ -40,25 +40,8 @@ if(NOT DEFINED QET_COMPONENTS)
message(".. QET_COMPONENTS is not set !!! I set them up !!!") message(".. QET_COMPONENTS is not set !!! I set them up !!!")
include(../../cmake/qet_compilation_vars.cmake) include(../../cmake/qet_compilation_vars.cmake)
endif() endif()
if(NOT DEFINED QT_VERSION_MAJOR) find_package(Qt6 REQUIRED COMPONENTS Test ${QET_COMPONENTS})
find_package( message(".. Qt version :" ${Qt6_VERSION})
QT
NAMES
Qt6
COMPONENTS
${QET_COMPONENTS}
Test
REQUIRED
)
endif()
find_package(
Qt${QT_VERSION_MAJOR}
COMPONENTS
${QET_COMPONENTS}
Test
REQUIRED)
message(".. Qt version :" ${Qt${QT_VERSION_MAJOR}_VERSION})
include(../../cmake/fetch_kdeaddons.cmake) include(../../cmake/fetch_kdeaddons.cmake)
include(../../cmake/fetch_singleapplication.cmake) include(../../cmake/fetch_singleapplication.cmake)