whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cmake: replace unused macro with a proper value 

Change-Id: Icc2b5a63fc503aa99bbb0c8ee9ffddc985e0e3da
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
bb10
Jean-Michaël Celerier 2019-02-12 09:29:34 +01:00 committed by Jean-Michaël Celerier
parent 92f81ebc21
commit bb2ae3e409
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/QtBuild.cmake
View File

@ -454,7 +454,7 @@ function(add_qt_module target)
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${INSTALL_BINDIR}"
VERSION ${PROJECT_VERSION}
SOVERSION ${PROJECT_VERSION_MAJOR}
OUTPUT_NAME "${module_versioned}")
OUTPUT_NAME "${INSTALL_CMAKE_NAMESPACE}${target}")
qt_internal_library_deprecation_level(deprecation_define)
@ -519,7 +519,7 @@ function(add_qt_module target)
qt_internal_add_linker_version_script("${target}")
endif()
install(TARGETS "${target}" "${target_private}" EXPORT "${module_versioned}Targets"
install(TARGETS "${target}" "${target_private}" EXPORT "${INSTALL_CMAKE_NAMESPACE}${target}Targets"
LIBRARY DESTINATION ${INSTALL_LIBDIR}
ARCHIVE DESTINATION ${INSTALL_LIBDIR}
PUBLIC_HEADER DESTINATION ${INSTALL_INCLUDEDIR}/${module}
@ -527,7 +527,7 @@ function(add_qt_module target)
)
set(config_install_dir "${INSTALL_LIBDIR}/cmake/${INSTALL_CMAKE_NAMESPACE}${target}")
install(EXPORT "${module_versioned}Targets" NAMESPACE ${QT_CMAKE_EXPORT_NAMESPACE}:: DESTINATION ${config_install_dir})
install(EXPORT "${INSTALL_CMAKE_NAMESPACE}${target}Targets" NAMESPACE ${QT_CMAKE_EXPORT_NAMESPACE}:: DESTINATION ${config_install_dir})
set(target_deps)
foreach(lib ${arg_PUBLIC_LIBRARIES})