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

qml2puppet: remove unnecessary flexibility

Browse Source 
standalone builds are doing:
cmake --install . --prefix <something_with_bin>

Change-Id: I61c0743c00f96c0505e2fa383e4bee41c2b6ceb9
Reviewed-by: Burak Hancerli <burak.hancerli@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tim Jenssen
2022-11-29 17:29:06 +01:00
parent b5befc6945
commit 036948c628
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,7 +14,7 @@ set(CMAKE_CXX_EXTENSIONS OFF)
if (NOT QT_CREATOR_API_DEFINED) if (NOT QT_CREATOR_API_DEFINED)
# standalone build # standalone build
set(DESTINATION DESTINATION $ENV{QDS_PUPPET_DESTINATION}) set(DESTINATION DESTINATION .)
include(QtCreatorIDEBranding) include(QtCreatorIDEBranding)
include(QtCreatorAPI) include(QtCreatorAPI)
endif() endif()
@@ -39,11 +39,7 @@ add_qtc_executable(qml2puppet
qmlpuppet.qrc qmlpuppet.qrc
) )
if (NOT "$ENV{QDS_PUPPET_VERSION}" STREQUAL "") set_target_properties(qml2puppet PROPERTIES OUTPUT_NAME qml2puppet-${IDE_VERSION})
set_target_properties(qml2puppet PROPERTIES OUTPUT_NAME qml2puppet-$ENV{QDS_PUPPET_VERSION})
else()
set_target_properties(qml2puppet PROPERTIES OUTPUT_NAME qml2puppet-${IDE_VERSION})
endif()
extend_qtc_executable(qml2puppet extend_qtc_executable(qml2puppet
CONDITION Qt5_VERSION VERSION_GREATER_EQUAL 6.0.0 CONDITION Qt5_VERSION VERSION_GREATER_EQUAL 6.0.0