mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-06 05:39:31 +08:00
45f34d72b9
* [Qt] Update to 6.6.0 * fix patch in qtbase * add tmp port to get qtwebengine logs * remove dep in tmp port * Fix CMAKE_BUILD_TYPE being hijacked by qt scripts. * Fix qtwebengine build? * add another script to be fixed * remove path to cmake * fix qtgrpc * looks like the variable is defined somewhere. * avoid aliasing only if the target exists * try different aliasing fix * fix patch * Dep stuff * reenable atomics * reenable librt * remove tmp * v db * v db * add vulkan-header as a dependency * v db * also needs libs * v db * add a comment to remember me not to touch this again * v db
18 lines
818 B
Diff
18 lines
818 B
Diff
diff --git a/cmake/QtTargetHelpers.cmake b/cmake/QtTargetHelpers.cmake
|
|
index 180ec33..a03e3b1 100644
|
|
--- a/cmake/QtTargetHelpers.cmake
|
|
+++ b/cmake/QtTargetHelpers.cmake
|
|
@@ -281,10 +281,10 @@ function(qt_internal_add_target_aliases target)
|
|
set_target_properties("${target}" PROPERTIES _qt_versionfull_alias "${versionfull_alias}")
|
|
|
|
get_target_property(type "${target}" TYPE)
|
|
- if (type STREQUAL EXECUTABLE)
|
|
+ if (type STREQUAL EXECUTABLE AND NOT TARGET "${versionfull_alias}")
|
|
add_executable("${versionless_alias}" ALIAS "${target}")
|
|
add_executable("${versionfull_alias}" ALIAS "${target}")
|
|
- else()
|
|
+ elseif(NOT type STREQUAL EXECUTABLE)
|
|
add_library("${versionless_alias}" ALIAS "${target}")
|
|
add_library("${versionfull_alias}" ALIAS "${target}")
|
|
endif()
|