Skip to content
Permalink
Browse files

more Qt version base

  • Loading branch information
3nids committed Mar 24, 2021
1 parent 286fd20 commit d2575a3f1a4cd76b8599c29adc82664559527f0d
Showing with 18 additions and 18 deletions.
  1. +18 −18 src/core/CMakeLists.txt
@@ -803,7 +803,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
set_source_files_properties(qgsspatialindex.cpp PROPERTIES COMPILE_FLAGS -Wno-overloaded-virtual)
endif()

if (QT_MOBILITY_LOCATION_FOUND OR Qt5Positioning_FOUND)
if (QT_MOBILITY_LOCATION_FOUND OR ${QT_VERSION_BASE}Positioning_FOUND)
set(QGIS_CORE_SRCS ${QGIS_CORE_SRCS}
gps/qgsqtlocationconnection.cpp
)
@@ -1619,7 +1619,7 @@ if (NOT WITH_QTWEBKIT)
)
endif()

if (QT_MOBILITY_LOCATION_FOUND OR Qt5Positioning_FOUND)
if (QT_MOBILITY_LOCATION_FOUND OR ${QT_VERSION_BASE}Positioning_FOUND)
set(QGIS_CORE_HDRS ${QGIS_CORE_HDRS}
gps/qgsqtlocationconnection.h
)
@@ -1654,7 +1654,7 @@ endif()
# install qgsconfig.h and plugin.h here so they can get into
# the OS X framework target

if (QT_MOBILITY_LOCATION_FOUND OR Qt5Positioning_FOUND)
if (QT_MOBILITY_LOCATION_FOUND OR ${QT_VERSION_BASE}Positioning_FOUND)
set(QGIS_CORE_HDRS ${QGIS_CORE_HDRS}
gps/qgsqtlocationconnection.h
gps/qgsgpsconnectionregistry.h
@@ -1748,7 +1748,7 @@ target_include_directories(qgis_core SYSTEM PUBLIC
${SPATIALITE_INCLUDE_DIR}
${QCA_INCLUDE_DIR}
${QTKEYCHAIN_INCLUDE_DIR}
${Qt5SerialPort_INCLUDE_DIRS}
${${QT_VERSION_BASE}SerialPort_INCLUDE_DIRS}
${Protobuf_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIRS}
)
@@ -1821,7 +1821,7 @@ GENERATE_EXPORT_HEADER(
set(QGIS_CORE_HDRS ${QGIS_CORE_HDRS} ${CMAKE_CURRENT_BINARY_DIR}/qgis_core.h)

if(ENABLE_MODELTEST)
target_link_libraries(qgis_core ${Qt5Test_LIBRARIES})
target_link_libraries(qgis_core ${${QT_VERSION_BASE}Test_LIBRARIES})
endif()

if (NOT WITH_INTERNAL_POLY2TRI)
@@ -1893,16 +1893,16 @@ if (ADD_CLAZY_CHECKS)
endif()

target_link_libraries(qgis_core
${Qt5Xml_LIBRARIES}
${Qt5Core_LIBRARIES}
${Qt5Gui_LIBRARIES}
${Qt5Widgets_LIBRARIES}
${Qt5Svg_LIBRARIES}
${Qt5PrintSupport_LIBRARIES}
${Qt5Network_LIBRARIES}
${QtXml_LIBRARIES}
${${QT_VERSION_BASE}Core_LIBRARIES}
${${QT_VERSION_BASE}Gui_LIBRARIES}
${${QT_VERSION_BASE}Widgets_LIBRARIES}
${${QT_VERSION_BASE}Svg_LIBRARIES}
${${QT_VERSION_BASE}PrintSupport_LIBRARIES}
${${QT_VERSION_BASE}Network_LIBRARIES}
${OPTIONAL_QTWEBKIT}
${Qt5Sql_LIBRARIES}
${Qt5Concurrent_LIBRARIES}
${${QT_VERSION_BASE}Sql_LIBRARIES}
${${QT_VERSION_BASE}Concurrent_LIBRARIES}
${QCA_LIBRARY}
${QTKEYCHAIN_LIBRARY}
${PROJ_LIBRARY}
@@ -1946,15 +1946,15 @@ if (MSVC)
set(TARGET_LINK_LIBRARIES qgis_core odbc32 odbccp32)
endif()

if (Qt5SerialPort_FOUND)
if (${QT_VERSION_BASE}SerialPort_FOUND)
target_link_libraries(qgis_core
Qt5::SerialPort
${QT_VERSION_BASE}::SerialPort
)
endif()

if (Qt5Positioning_FOUND)
if (${QT_VERSION_BASE}Positioning_FOUND)
target_link_libraries(qgis_core
Qt5::Positioning
${QT_VERSION_BASE}::Positioning
)
endif()

0 comments on commit d2575a3

Please sign in to comment.