diff options
| author | Jean-Michaël Celerier <jeanmichael.celerier@gmail.com> | 2019-02-12 09:29:34 +0100 |
|---|---|---|
| committer | Jean-Michaël Celerier <jean-michael.celerier@kdab.com> | 2019-02-12 11:28:08 +0000 |
| commit | bb2ae3e409acd88877ddf3d19054a0842404b568 (patch) | |
| tree | 1ffba14ebb9a427f33241cca0879748b377e94b5 /cmake | |
| parent | 92f81ebc21ef4b3ea60a04dcae1d20387082a7e4 (diff) | |
cmake: replace unused macro with a proper value
Change-Id: Icc2b5a63fc503aa99bbb0c8ee9ffddc985e0e3da
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtBuild.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index 6a92f573b1..08ac660f5f 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -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}) |