diff --git a/CMakeLists.txt b/CMakeLists.txt index 359434bf5a3..8ae13427370 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -361,7 +361,7 @@ if(WITH_CORE) find_package(Proj) find_package(GEOS) find_package(GDAL) - 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 deleted file mode 100644 index c213dc9c044..00000000000 --- a/cmake/FindExpat.cmake +++ /dev/null @@ -1,57 +0,0 @@ -# Find Expat -# ~~~~~~~~~~ -# Copyright (c) 2007, Martin Dobias -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. -# -# CMake module to search for Expat library -# (library for parsing XML files) -# -# If it's found it sets EXPAT_FOUND to TRUE -# and following variables are set: -# EXPAT_INCLUDE_DIR -# EXPAT_LIBRARY - -# FIND_PATH and FIND_LIBRARY normally search standard locations -# before the specified paths. To search non-standard paths first, -# FIND_* is invoked first with specified paths and NO_DEFAULT_PATH -# and then again with no specified paths to search the default -# locations. When an earlier FIND_* succeeds, subsequent FIND_*s -# searching for the same item do nothing. -FIND_PATH(EXPAT_INCLUDE_DIR expat.h - "$ENV{LIB_DIR}/include/" - "$ENV{LIB_DIR}/include/expat" - c:/msys/local/include - NO_DEFAULT_PATH - ) -FIND_PATH(EXPAT_INCLUDE_DIR expat.h) -#libexpat needed for msvc version -FIND_LIBRARY(EXPAT_LIBRARY NAMES expat libexpat PATHS - "$ENV{LIB_DIR}/lib" - c:/msys/local/lib - NO_DEFAULT_PATH - ) -FIND_LIBRARY(EXPAT_LIBRARY NAMES expat libexpat) - -IF (EXPAT_INCLUDE_DIR AND EXPAT_LIBRARY) - SET(EXPAT_FOUND TRUE) -ENDIF (EXPAT_INCLUDE_DIR AND EXPAT_LIBRARY) - - -IF (EXPAT_FOUND) - - IF (NOT EXPAT_FIND_QUIETLY) - MESSAGE(STATUS "Found Expat: ${EXPAT_LIBRARY}") - ENDIF (NOT EXPAT_FIND_QUIETLY) - -ELSE (EXPAT_FOUND) - - IF (EXPAT_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could not find Expat") - ELSE (EXPAT_FIND_REQUIRED) - IF (NOT EXPAT_FIND_QUIETLY) - MESSAGE(STATUS "Could not find Expat") - ENDIF (NOT EXPAT_FIND_QUIETLY) - ENDIF (EXPAT_FIND_REQUIRED) - -ENDIF (EXPAT_FOUND) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 79fb3e24394..4bc864554c4 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -2252,7 +2252,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} @@ -2421,7 +2420,7 @@ target_link_libraries(qgis_core ${GEOS_LIBRARY} ${GDAL_LIBRARY} ${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 index 4adace3b04a..5b49f3f17b7 100644 --- 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 index e7c9f2cd8c5..045f8757be8 100644 --- 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 index e1f1e0a8526..0317960b364 100644 --- 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 index 585e5edf71d..5570fbd8ac2 100644 --- 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 index ea16e3f8a10..3e871fbbadd 100644 --- 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 index dd2c90a8258..ec9fa6b2eba 100644 --- 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} )