From 036948c6286cc01d8e3bbf0e594dc0bc5358e43b Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Tue, 29 Nov 2022 17:29:06 +0100 Subject: [PATCH] qml2puppet: remove unnecessary flexibility standalone builds are doing: cmake --install . --prefix Change-Id: I61c0743c00f96c0505e2fa383e4bee41c2b6ceb9 Reviewed-by: Burak Hancerli Reviewed-by: Tim Jenssen --- src/tools/qml2puppet/CMakeLists.txt | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/tools/qml2puppet/CMakeLists.txt b/src/tools/qml2puppet/CMakeLists.txt index 7ef09420ee2..074099be894 100644 --- a/src/tools/qml2puppet/CMakeLists.txt +++ b/src/tools/qml2puppet/CMakeLists.txt @@ -14,7 +14,7 @@ set(CMAKE_CXX_EXTENSIONS OFF) if (NOT QT_CREATOR_API_DEFINED) # standalone build - set(DESTINATION DESTINATION $ENV{QDS_PUPPET_DESTINATION}) + set(DESTINATION DESTINATION .) include(QtCreatorIDEBranding) include(QtCreatorAPI) endif() @@ -39,11 +39,7 @@ add_qtc_executable(qml2puppet qmlpuppet.qrc ) -if (NOT "$ENV{QDS_PUPPET_VERSION}" STREQUAL "") - set_target_properties(qml2puppet PROPERTIES OUTPUT_NAME qml2puppet-$ENV{QDS_PUPPET_VERSION}) -else() - set_target_properties(qml2puppet PROPERTIES OUTPUT_NAME qml2puppet-${IDE_VERSION}) -endif() +set_target_properties(qml2puppet PROPERTIES OUTPUT_NAME qml2puppet-${IDE_VERSION}) extend_qtc_executable(qml2puppet CONDITION Qt5_VERSION VERSION_GREATER_EQUAL 6.0.0