feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Qml2Puppet: fix stand alone puppet builds

Browse Source 
Change-Id: I24f5ca625429c636052d0c92c495a20a6942c92f
Reviewed-by: Burak Hancerli <burak.hancerli@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tim Jenssen
2024-05-22 13:07:55 +02:00
parent b5db9f8fb3
commit 0433b8c479
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/tools/qml2puppet/CMakeLists.txt
View File

@@ -26,10 +26,7 @@ if (NOT QT_CREATOR_API_DEFINED)
COMPONENTS Concurrent Core Gui Network PrintSupport Qml Quick Sql Widgets Xml COMPONENTS Concurrent Core Gui Network PrintSupport Qml Quick Sql Widgets Xml
REQUIRED REQUIRED
) )
endif() set(IS_STAND_ALONE_PUPPET_BUILD ON)
if (NOT TARGET QmlPuppetCommunication)
include(../../libs/qmlpuppetcommunication/QmlPuppetCommunication.cmake)
endif() endif()
add_qtc_executable(qml2puppet add_qtc_executable(qml2puppet
@@ -38,7 +35,6 @@ add_qtc_executable(qml2puppet
DEPENDS DEPENDS
Qt::CorePrivate Qt::Widgets Qt::QmlPrivate Qt::CorePrivate Qt::Widgets Qt::QmlPrivate
Qt::QuickPrivate Qt::Network Qt::GuiPrivate Qt::QuickPrivate Qt::Network Qt::GuiPrivate
app_version
QmlPuppetCommunication QmlPuppetCommunication
INCLUDES INCLUDES
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
@@ -52,6 +48,15 @@ add_qtc_executable(qml2puppet
OUTPUT_NAME qml2puppet-${IDE_VERSION} OUTPUT_NAME qml2puppet-${IDE_VERSION}
) )
if (IS_STAND_ALONE_PUPPET_BUILD)
include(../../libs/qmlpuppetcommunication/QmlPuppetCommunication.cmake)
configure_file(../../app/app_version.h.cmakein app/app_version.h ESCAPE_QUOTES)
else()
extend_qtc_executable(qml2puppet
DEPENDS app_version
)
endif()
extend_qtc_executable(qml2puppet extend_qtc_executable(qml2puppet
CONDITION Qt6_VERSION CONDITION Qt6_VERSION
SOURCES SOURCES