Merge branch 'master' into cmake-gdal

m-kuhn · web-flow · commit 01b0eff8b840 · 2023-09-18T10:52:45.000+02:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -361,7 +361,7 @@ if(WITH_CORE)
   find_package(Proj)
   find_package(GEOS)
   find_package(GDAL REQUIRED)
-  find_package(Expat REQUIRED)
+  find_package(EXPAT REQUIRED)
   find_package(Spatialindex REQUIRED)
   find_package(LibZip REQUIRED)
 
diff --git a/cmake/FindExpat.cmake b/cmake/FindExpat.cmake
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -2251,7 +2251,6 @@ target_include_directories(qgis_core SYSTEM PUBLIC
   ${LIBZIP_INCLUDE_DIRS}
   ${SPATIALINDEX_INCLUDE_DIR} # before GEOS for case-insensitive filesystems
   ${GEOS_INCLUDE_DIR}
-  ${EXPAT_INCLUDE_DIR}
   ${SQLITE3_INCLUDE_DIR}
   ${QCA_INCLUDE_DIR}
   ${QTKEYCHAIN_INCLUDE_DIR}
@@ -2420,7 +2419,7 @@ target_link_libraries(qgis_core
   ${GEOS_LIBRARY}
   GDAL::GDAL
   ${SPATIALINDEX_LIBRARY}
-  ${EXPAT_LIBRARY}
+  EXPAT::EXPAT
   ${SQLITE3_LIBRARY}
   ${LIBZIP_LIBRARY}
   ${Protobuf_LITE_LIBRARY}
diff --git a/src/providers/gpx/CMakeLists.txt b/src/providers/gpx/CMakeLists.txt
@@ -34,7 +34,6 @@ add_library(provider_gpx MODULE ${GPX_SRCS})
 target_compile_features(provider_gpx PRIVATE cxx_std_17)
 
 target_link_libraries(provider_gpx
-  ${EXPAT_LIBRARY}
   qgis_core
 )
 
diff --git a/src/providers/wfs/CMakeLists.txt b/src/providers/wfs/CMakeLists.txt
@@ -62,7 +62,6 @@ target_include_directories(provider_wfs_a PUBLIC
 )
 
 target_link_libraries(provider_wfs_a
-  ${EXPAT_LIBRARY}
   qgis_core
 )
 
@@ -120,7 +119,6 @@ else()
   target_compile_definitions(provider_wfs PRIVATE "-DQT_NO_FOREACH")
 
   target_link_libraries (provider_wfs
-    ${EXPAT_LIBRARY}
     qgis_core
   )
 
diff --git a/src/quickgui/CMakeLists.txt b/src/quickgui/CMakeLists.txt
@@ -31,7 +31,6 @@ include_directories(SYSTEM
   ${LIBZIP_INCLUDE_DIRS}
   ${SPATIALINDEX_INCLUDE_DIR}
   ${GEOS_INCLUDE_DIR}
-  ${EXPAT_INCLUDE_DIR}
   ${QCA_INCLUDE_DIR}
   ${QTKEYCHAIN_INCLUDE_DIR}
 )
diff --git a/src/quickgui/plugin/CMakeLists.txt b/src/quickgui/plugin/CMakeLists.txt
@@ -33,7 +33,6 @@ include_directories(SYSTEM
   ${LIBZIP_INCLUDE_DIRS}
   ${SPATIALINDEX_INCLUDE_DIR}
   ${GEOS_INCLUDE_DIR}
-  ${EXPAT_INCLUDE_DIR}
   ${SQLITE3_INCLUDE_DIR}
   ${QCA_INCLUDE_DIR}
   ${QTKEYCHAIN_INCLUDE_DIR}
diff --git a/tests/src/quickgui/CMakeLists.txt b/tests/src/quickgui/CMakeLists.txt
@@ -21,7 +21,6 @@ include_directories(SYSTEM
     ${LIBZIP_INCLUDE_DIRS}
     ${SPATIALINDEX_INCLUDE_DIR}
     ${GDAL_INCLUDE_DIR}
-    ${EXPAT_INCLUDE_DIR}
     ${QCA_INCLUDE_DIR}
     ${QTKEYCHAIN_INCLUDE_DIR}
 )
diff --git a/tests/src/quickgui/app/CMakeLists.txt b/tests/src/quickgui/app/CMakeLists.txt
@@ -26,7 +26,6 @@ include_directories(SYSTEM
   ${LIBZIP_INCLUDE_DIRS}
   ${SPATIALINDEX_INCLUDE_DIR}
   ${GEOS_INCLUDE_DIR}
-  ${EXPAT_INCLUDE_DIR}
   ${QCA_INCLUDE_DIR}
   ${QTKEYCHAIN_INCLUDE_DIR}
 )

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,6 @@ add_library(provider_gpx MODULE ${GPX_SRCS})`
`34`	`34`	`target_compile_features(provider_gpx PRIVATE cxx_std_17)`
`35`	`35`
`36`	`36`	`target_link_libraries(provider_gpx`
`37`		`- ${EXPAT_LIBRARY}`
`38`	`37`	`qgis_core`
`39`	`38`	`)`
`40`	`39`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,6 @@ target_include_directories(provider_wfs_a PUBLIC`
`62`	`62`	`)`
`63`	`63`
`64`	`64`	`target_link_libraries(provider_wfs_a`
`65`		`- ${EXPAT_LIBRARY}`
`66`	`65`	`qgis_core`
`67`	`66`	`)`
`68`	`67`
`@@ -120,7 +119,6 @@ else()`
`120`	`119`	`target_compile_definitions(provider_wfs PRIVATE "-DQT_NO_FOREACH")`
`121`	`120`
`122`	`121`	`target_link_libraries (provider_wfs`
`123`		`- ${EXPAT_LIBRARY}`
`124`	`122`	`qgis_core`
`125`	`123`	`)`
`126`	`124`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,6 @@ include_directories(SYSTEM`
`31`	`31`	`${LIBZIP_INCLUDE_DIRS}`
`32`	`32`	`${SPATIALINDEX_INCLUDE_DIR}`
`33`	`33`	`${GEOS_INCLUDE_DIR}`
`34`		`- ${EXPAT_INCLUDE_DIR}`
`35`	`34`	`${QCA_INCLUDE_DIR}`
`36`	`35`	`${QTKEYCHAIN_INCLUDE_DIR}`
`37`	`36`	`)`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@ include_directories(SYSTEM`
`21`	`21`	`${LIBZIP_INCLUDE_DIRS}`
`22`	`22`	`${SPATIALINDEX_INCLUDE_DIR}`
`23`	`23`	`${GDAL_INCLUDE_DIR}`
`24`		`- ${EXPAT_INCLUDE_DIR}`
`25`	`24`	`${QCA_INCLUDE_DIR}`
`26`	`25`	`${QTKEYCHAIN_INCLUDE_DIR}`
`27`	`26`	`)`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,6 @@ include_directories(SYSTEM`
`26`	`26`	`${LIBZIP_INCLUDE_DIRS}`
`27`	`27`	`${SPATIALINDEX_INCLUDE_DIR}`
`28`	`28`	`${GEOS_INCLUDE_DIR}`
`29`		`- ${EXPAT_INCLUDE_DIR}`
`30`	`29`	`${QCA_INCLUDE_DIR}`
`31`	`30`	`${QTKEYCHAIN_INCLUDE_DIR}`
`32`	`31`	`)`