Skip to content
Snippets Groups Projects
Commit 546d4c9a authored by Ben Boeckel's avatar Ben Boeckel
Browse files

Examples/QML: fix CMake command style

parent 6b3e195a
No related branches found
No related tags found
No related merge requests found
......@@ -11,13 +11,13 @@ find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core Quick)
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Quick)
if (NOT "${Qt5_DIR}" STREQUAL "")
message (STATUS "Qt5_DIR:" ${Qt5_DIR})
message(STATUS "Qt5_DIR:" ${Qt5_DIR})
elseif (NOT "${Qt6_DIR}" STREQUAL "")
message (STATUS "Qt6_DIR:" ${Qt6_DIR})
endif()
message (STATUS "QT_VERSION: Qt${QT_VERSION_MAJOR}")
message(STATUS "Qt6_DIR:" ${Qt6_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}
......@@ -26,19 +26,19 @@ if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
# set_property(TARGET ${MYNAME} APPEND PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR
# ${CMAKE_CURRENT_SOURCE_DIR}/android)
# For more information, see https://doc.qt.io/qt-6/qt-add-executable.html#target-creation
else()
if(ANDROID)
else ()
if (ANDROID)
add_library(${MYNAME} SHARED
${PROJECT_SOURCES}
)
# Define properties for Android with Qt 5 after find_package() calls as:
# set(ANDROID_PACKAGE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/android")
else()
else ()
add_executable(${MYNAME}
${PROJECT_SOURCES}
)
endif()
endif()
endif ()
endif ()
target_compile_definitions(${MYNAME} PRIVATE
$<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:QT_QML_DEBUG>
......@@ -59,7 +59,7 @@ install(TARGETS ${MYNAME}
BUNDLE DESTINATION .
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
if(QT_VERSION_MAJOR EQUAL 6)
if (QT_VERSION_MAJOR EQUAL 6)
qt_import_qml_plugins(${MYNAME})
qt_finalize_executable(${MYNAME})
endif()
endif ()
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment