mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-02-19 11:29:08 -06:00
Explicitly request the Qt version
This commit is contained in:
@@ -81,19 +81,20 @@ set(HEADER_SOURCE
|
||||
include/profile/propertiesdialog.h
|
||||
)
|
||||
|
||||
find_package(Qt5 COMPONENTS Widgets)
|
||||
find_package(QT NAMES Qt6 Qt5 COMPONENTS Core Widgets REQUIRED)
|
||||
set(MOC_FILES "")
|
||||
set(RESOURCE_FILES "")
|
||||
set(LIBRARIES "")
|
||||
|
||||
if (${Qt5_found})
|
||||
if (${QT_VERSION_MAJOR} EQUAL 5)
|
||||
find_package(Qt5 COMPONENTS Widgets)
|
||||
qt5_wrap_cpp(
|
||||
MOC_FILES
|
||||
${HEADER_SOURCE}
|
||||
)
|
||||
qt5_add_resources(RESOURCE_FILES resources/resources.qrc)
|
||||
set(LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
|
||||
else ()
|
||||
set(LIBRARIES )
|
||||
elseif (${QT_VERSION_MAJOR} EQUAL 6)
|
||||
find_package(Qt6 COMPONENTS Widgets REQUIRED)
|
||||
|
||||
qt6_wrap_cpp(
|
||||
@@ -101,13 +102,21 @@ else ()
|
||||
${HEADER_SOURCE}
|
||||
)
|
||||
qt6_add_resources(RESOURCE_FILES resources/resources.qrc)
|
||||
set(LIBRARIES Qt6::Core Qt6::Gui Qt6::Widgets)
|
||||
elseif (NOT DEFINED QT_VERSION_MAJOR)
|
||||
message(FATAL_ERROR "Unable to find Qt version")
|
||||
else ()
|
||||
message(FATAL_ERROR "Unsupported Qt version")
|
||||
endif()
|
||||
|
||||
add_library(openspace-ui-launcher STATIC ${HEADER_FILES} ${SOURCE_FILES} ${MOC_FILES} ${RESOURCE_FILES})
|
||||
set_openspace_compile_settings(openspace-ui-launcher)
|
||||
target_include_directories(openspace-ui-launcher PUBLIC include)
|
||||
target_link_libraries(openspace-ui-launcher PUBLIC ${LIBRARIES} openspace-core)
|
||||
target_link_libraries(
|
||||
openspace-ui-launcher
|
||||
PUBLIC
|
||||
openspace-core
|
||||
Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Gui Qt${QT_VERSION_MAJOR}::Widgets
|
||||
)
|
||||
|
||||
if (MSVC)
|
||||
set(MSVC_WARNINGS
|
||||
|
||||
Reference in New Issue
Block a user