Martchus
/
qtutilities
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix adding public Qt modules in pkg-config

This commit is contained in:
Martchus 2017-10-08 19:31:28 +02:00
parent d65835be50
commit b2e3506ff5
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmake/modules/QtLinkage.cmake
View File

@ -48,6 +48,7 @@ if(NOT DEFINED QT_LINKAGE_DETERMINED)
set(QT5_${MODULE}_ASSUME_STATIC OFF)
set(QT5_${MODULE}_FOUND ON)
# reverse lookup for pkg-config
set(PC_PKG_STATIC_Qt5_${MODULE} "StaticQt5${MODULE}")
set(PC_PKG_STATIC_StaticQt5_${MODULE} "StaticQt5${MODULE}")
set(PC_PKG_STATIC_Qt5_static_${MODULE} "StaticQt5${MODULE}")
else()
@ -84,8 +85,8 @@ if(NOT DEFINED QT_LINKAGE_DETERMINED)
macro(use_qt5_module MODULE REQUIRED)
if(${MODULE} IN_LIST META_PUBLIC_QT_MODULES)
list(APPEND META_PUBLIC_SHARED_LIB_DEPENDS QT5_${MODULE})
list(APPEND META_PUBLIC_STATIC_LIB_DEPENDS QT5_${MODULE})
list(APPEND META_PUBLIC_SHARED_LIB_DEPENDS "${QT5_${MODULE}_DYNAMIC_LIB}")
list(APPEND META_PUBLIC_STATIC_LIB_DEPENDS "${QT5_${MODULE}_STATIC_LIB}")
endif()
link_against_library("QT5_${MODULE}" "${QT_LINKAGE}" "${REQUIRED}")
endmacro()