sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-23 00:02:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

QtPositioning is required, no need to make it optional

Browse Source
This commit is contained in:
Matthias Kuhn 2024-12-30 10:39:08 +01:00
parent 484389a8f4
commit 26c656b6ae
1 changed files with 4 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/core/CMakeLists.txt
View File

@ -83,6 +83,7 @@ set(QGIS_CORE_SRCS
gps/qgsgpsinformation.cpp
gps/qgsgpslogger.cpp
gps/qgsnmeaconnection.cpp
gps/qgsqtlocationconnection.cpp
gps/qgssatelliteinformation.cpp
gps/qgsvectorlayergpslogger.cpp
@ -1066,12 +1067,6 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
set_source_files_properties(qgsspatialindex.cpp PROPERTIES COMPILE_FLAGS -Wno-overloaded-virtual)
endif()
if (${QT_VERSION_BASE}Positioning_FOUND)
set(QGIS_CORE_SRCS ${QGIS_CORE_SRCS}
gps/qgsqtlocationconnection.cpp
)
endif()
if(NOT MSVC)
set_source_files_properties(
${FLEX_QgsExpressionLexer_OUTPUTS}
@ -1549,6 +1544,8 @@ set(QGIS_CORE_HDRS
gps/qgsgpsinformation.h
gps/qgsgpslogger.h
gps/qgsnmeaconnection.h
gps/qgsqtlocationconnection.h
gps/qgsgpsconnectionregistry.h
gps/qgssatelliteinformation.h
gps/qgsvectorlayergpslogger.h
@ -2170,13 +2167,6 @@ if (NOT WITH_QTWEBKIT)
)
endif()
if (${QT_VERSION_BASE}Positioning_FOUND)
set(QGIS_CORE_HDRS ${QGIS_CORE_HDRS}
gps/qgsqtlocationconnection.h
)
endif()
if (HAVE_WEBENGINE)
set(QGIS_CORE_SRCS ${QGIS_CORE_SRCS}
web/qgswebenginepage.cpp
@ -2215,13 +2205,6 @@ endif()
# install qgsconfig.h and plugin.h here so they can get into
# the OS X framework target
if (${QT_VERSION_BASE}Positioning_FOUND)
set(QGIS_CORE_HDRS ${QGIS_CORE_HDRS}
gps/qgsqtlocationconnection.h
gps/qgsgpsconnectionregistry.h
)
endif()
if (HAVE_OPENCL)
set(QGIS_CORE_SRCS ${QGIS_CORE_SRCS}
qgsopenclutils.cpp
@ -2565,6 +2548,7 @@ target_link_libraries(qgis_core
${QT_VERSION_BASE}::Network
${QT_VERSION_BASE}::Sql
${QT_VERSION_BASE}::Concurrent
${QT_VERSION_BASE}::Positioning
${OPTIONAL_QTWEBKIT}
${QCA_LIBRARY}
GEOS::geos_c
@ -2680,12 +2664,6 @@ if (${QT_VERSION_BASE}SerialPort_FOUND)
)
endif()
if (${QT_VERSION_BASE}Positioning_FOUND)
target_link_libraries(qgis_core
${QT_VERSION_BASE}::Positioning
)
endif()
target_compile_definitions(qgis_core PRIVATE "-DQT_NO_FOREACH")
target_compile_definitions(qgis_core PRIVATE "CMAKE_SOURCE_DIR=\"${CMAKE_SOURCE_DIR}\"")