From 7ad733f5bdfe3f1fa6fdaee66104fd06431317cf Mon Sep 17 00:00:00 2001 From: Denis Rouzaud Date: Wed, 24 Mar 2021 08:44:19 +0100 Subject: [PATCH] fix include dirs --- src/core/CMakeLists.txt | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index ced3e7cbb8ba..8ddb058348d4 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -1737,7 +1737,14 @@ add_library(qgis_core ${LIBRARY_TYPE} ${QGIS_CORE_SRCS} ${QGIS_CORE_HDRS} ${QGIS target_compile_features(qgis_core PRIVATE cxx_std_17) target_include_directories(qgis_core SYSTEM PUBLIC - ${QT_INCLUDE_DIR} + ${${QT_VERSION_BASE}Core_INCLUDE_DIRS} + ${${QT_VERSION_BASE}Gui_INCLUDE_DIRS} + ${${QT_VERSION_BASE}Widgets_INCLUDE_DIRS} + ${${QT_VERSION_BASE}Svg_INCLUDE_DIRS} + ${${QT_VERSION_BASE}PrintSupport_INCLUDE_DIRS} + ${${QT_VERSION_BASE}Network_INCLUDE_DIRS} + ${${QT_VERSION_BASE}Sql_INCLUDE_DIRS} + ${${QT_VERSION_BASE}Concurrent_INCLUDE_DIRS} ${PROJ_INCLUDE_DIR} ${GDAL_INCLUDE_DIR} ${LIBZIP_INCLUDE_DIRS} @@ -1900,9 +1907,9 @@ target_link_libraries(qgis_core ${${QT_VERSION_BASE}Svg_LIBRARIES} ${${QT_VERSION_BASE}PrintSupport_LIBRARIES} ${${QT_VERSION_BASE}Network_LIBRARIES} - ${OPTIONAL_QTWEBKIT} ${${QT_VERSION_BASE}Sql_LIBRARIES} ${${QT_VERSION_BASE}Concurrent_LIBRARIES} + ${OPTIONAL_QTWEBKIT} ${QCA_LIBRARY} ${QTKEYCHAIN_LIBRARY} ${PROJ_LIBRARY}