diff --git a/Examples/GUI/QML/Common.cmake b/Examples/GUI/QML/Common.cmake index 9013180f5d4ac21214bfbf4817cde745df1905d5..1324dfa3bf08626b882b41c9cef4874346d5146e 100644 --- a/Examples/GUI/QML/Common.cmake +++ b/Examples/GUI/QML/Common.cmake @@ -7,17 +7,14 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) # Qt section generated by Qt Creator 9.0.0 -find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core Quick) -find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Quick) +find_package("Qt${VTK_QT_VERSION}" REQUIRED COMPONENTS Core Quick) -if (NOT "${Qt5_DIR}" STREQUAL "") - message(STATUS "Qt5_DIR:" ${Qt5_DIR}) -elseif (NOT "${Qt6_DIR}" STREQUAL "") - message(STATUS "Qt6_DIR:" ${Qt6_DIR}) +if (NOT "${Qt${VTK_QT_VERSION}_DIR}" STREQUAL "") + message(STATUS "Qt${VTK_QT_VERSION}_DIR:" ${Qt${VTK_QT_VERSION}_DIR}) endif () message(STATUS "QT_VERSION: Qt${QT_VERSION_MAJOR}") -if (${QT_VERSION_MAJOR} GREATER_EQUAL 6) +if (QT_VERSION_MAJOR GREATER_EQUAL 6) qt_add_executable(${MYNAME} MANUAL_FINALIZATION ${PROJECT_SOURCES} @@ -45,7 +42,7 @@ target_compile_definitions(${MYNAME} PRIVATE ) target_link_libraries(${MYNAME} - PRIVATE Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Quick) + PRIVATE Qt${VTK_QT_VERSION}::Core Qt${VTK_QT_VERSION}::Quick) set_target_properties(${MYNAME} PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER my.example.com @@ -59,7 +56,7 @@ install(TARGETS ${MYNAME} BUNDLE DESTINATION . LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) -if (QT_VERSION_MAJOR EQUAL 6) +if (VTK_QT_VERSION EQUAL 6) qt_import_qml_plugins(${MYNAME}) qt_finalize_executable(${MYNAME}) endif ()