Do not make versioned hard-links when -developer-build
Amends ca24ee14df2c47f748240c0bc4a2250c15c111da Fixes: QTBUG-109271 Change-Id: I19065078fb23581bf552e44d8fef57d4a5d36eaa Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
parent
0b6db3b8be
commit
fd6b136337
@ -161,7 +161,7 @@ HostSpec=${QT_QMAKE_HOST_MKSPEC}
|
|||||||
set(host_qt_bindir "${host_prefix}/${QT${PROJECT_VERSION_MAJOR}_HOST_INFO_BINDIR}")
|
set(host_qt_bindir "${host_prefix}/${QT${PROJECT_VERSION_MAJOR}_HOST_INFO_BINDIR}")
|
||||||
file(TO_NATIVE_PATH "${host_qt_bindir}" host_qt_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}")
|
set(tool_version "${PROJECT_VERSION_MAJOR}")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
@ -184,7 +184,7 @@ HostSpec=${QT_QMAKE_HOST_MKSPEC}
|
|||||||
DESTINATION "${INSTALL_BINDIR}")
|
DESTINATION "${INSTALL_BINDIR}")
|
||||||
|
|
||||||
# Configuring a new wrapper file, this type setting the tool_version
|
# 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}")
|
set(versioned_wrapper "preliminary/${wrapper_prefix}${tool_name}${tool_version}${wrapper_extension}")
|
||||||
configure_file("${wrapper_in_file}" "${versioned_wrapper}" @ONLY NEWLINE_STYLE ${newline_style})
|
configure_file("${wrapper_in_file}" "${versioned_wrapper}" @ONLY NEWLINE_STYLE ${newline_style})
|
||||||
qt_copy_or_install(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/${versioned_wrapper}"
|
qt_copy_or_install(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/${versioned_wrapper}"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user