From fd6b136337ac94d60d0541700b135721e2d46129 Mon Sep 17 00:00:00 2001 From: Amir Masoud Abdol Date: Thu, 8 Dec 2022 20:42:14 +0100 Subject: [PATCH] Do not make versioned hard-links when -developer-build Amends ca24ee14df2c47f748240c0bc4a2250c15c111da Fixes: QTBUG-109271 Change-Id: I19065078fb23581bf552e44d8fef57d4a5d36eaa Reviewed-by: Alexandru Croitor --- cmake/QtQmakeHelpers.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/QtQmakeHelpers.cmake b/cmake/QtQmakeHelpers.cmake index 625a1232be0..2edce3c0728 100644 --- a/cmake/QtQmakeHelpers.cmake +++ b/cmake/QtQmakeHelpers.cmake @@ -161,7 +161,7 @@ HostSpec=${QT_QMAKE_HOST_MKSPEC} set(host_qt_bindir "${host_prefix}/${QT${PROJECT_VERSION_MAJOR}_HOST_INFO_BINDIR}") file(TO_NATIVE_PATH "${host_qt_bindir}" host_qt_bindir) - if(QT_CREATE_VERSIONED_HARD_LINK) + if(QT_CREATE_VERSIONED_HARD_LINK AND QT_WILL_INSTALL) set(tool_version "${PROJECT_VERSION_MAJOR}") endif() @@ -184,7 +184,7 @@ HostSpec=${QT_QMAKE_HOST_MKSPEC} DESTINATION "${INSTALL_BINDIR}") # Configuring a new wrapper file, this type setting the tool_version - if(QT_CREATE_VERSIONED_HARD_LINK) + if(QT_CREATE_VERSIONED_HARD_LINK AND QT_WILL_INSTALL) set(versioned_wrapper "preliminary/${wrapper_prefix}${tool_name}${tool_version}${wrapper_extension}") configure_file("${wrapper_in_file}" "${versioned_wrapper}" @ONLY NEWLINE_STYLE ${newline_style}) qt_copy_or_install(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/${versioned_wrapper}"