AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix QtDeclcarative static builds

Browse Source 
Incorrect variable name was being used to set the target in the parent
scope.

Change-Id: I73ea644ebf94c9b9a62b34b1ad493e488729ff2f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Leander Beernaert 2019-09-18 16:18:32 +02:00
parent c58df80cf7
commit 1496a88429
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmake/QtBuild.cmake
View File

@ -2009,12 +2009,10 @@ function(add_qt_resource target resourceName)
) )
if (out_targets) if (out_targets)
foreach(out_target IN LISTS out_targets) qt_install(TARGETS ${out_targets}
qt_install(TARGETS "${out_target}" EXPORT "${INSTALL_CMAKE_NAMESPACE}${target}Targets"
EXPORT "${INSTALL_CMAKE_NAMESPACE}${target}Targets" DESTINATION ${INSTALL_LIBDIR}
DESTINATION ${INSTALL_LIBDIR} )
)
endforeach()
endif() endif()
endfunction() endfunction()

2
cmake/QtResource.cmake.in
View File

@ -224,7 +224,7 @@ function(QT@PROJECT_VERSION_MAJOR@_PROCESS_RESOURCE target resourceName)
PREFIX ${rcc_PREFIX} PREFIX ${rcc_PREFIX}
OUTPUT_REMAINING_RESOURCES resources OUTPUT_REMAINING_RESOURCES resources
OUTPUT_RESOURCE_NAME newResourceName OUTPUT_RESOURCE_NAME newResourceName
OUTPUT_GENERATED_TARGET output_target OUTPUT_GENERATED_TARGET output_target_quick
) )
if (NOT resources) if (NOT resources)