Merge remote-tracking branch 'origin/master' into HEADupdate-geos-381

5 files changed, 52 insertions, 53 deletions

diff --git a/ports/expat/CONTROL b/ports/expat/CONTROL
index 53474ae2b..2bfc11ab7 100644
--- a/ports/expat/CONTROL
+++ b/ports/expat/CONTROL
@@ -1,4 +1,4 @@
 Source: expat
-Version: 2.2.9
+Version: 2020-08-18
 Homepage: https://github.com/libexpat/libexpat
-Description: XML parser library written in C
\ No newline at end of file
+Description: XML parser library written in C
diff --git a/ports/expat/fix-find-package-by-cmake.patch b/ports/expat/fix-find-package-by-cmake.patch
deleted file mode 100644
index 830327944..000000000
--- a/ports/expat/fix-find-package-by-cmake.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/expat/CMakeLists.txt b/expat/CMakeLists.txt

-index 2084424..f3b9207 100644

---- a/expat/CMakeLists.txt

-+++ b/expat/CMakeLists.txt

-@@ -269,6 +269,10 @@ if(EXPAT_WITH_LIBBSD)

-     target_link_libraries(${_EXPAT_TARGET} ${LIB_BSD})

- endif()

- 

-+target_include_directories(${_EXPAT_TARGET} INTERFACE

-+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>

-+    $<INSTALL_INTERFACE:include>)

-+

- set(LIBCURRENT 7)    # sync

- set(LIBREVISION 11)  # with

- set(LIBAGE 6)        # configure.ac!

-@@ -490,7 +494,7 @@ configure_package_config_file(

-         cmake/expat-config.cmake.in

-         cmake/expat-config.cmake

-     INSTALL_DESTINATION

--        ${CMAKE_INSTALL_LIBDIR}/cmake/expat-${PROJECT_VERSION}/

-+        ${CMAKE_INSTALL_LIBDIR}/cmake/expat/

- )

- write_basic_package_version_file(

-     cmake/expat-config-version.cmake

-@@ -507,13 +511,13 @@ expat_install(

-         ${CMAKE_CURRENT_BINARY_DIR}/cmake/expat-config.cmake

-         ${CMAKE_CURRENT_BINARY_DIR}/cmake/expat-config-version.cmake

-     DESTINATION

--        ${CMAKE_INSTALL_LIBDIR}/cmake/expat-${PROJECT_VERSION}/

-+        ${CMAKE_INSTALL_LIBDIR}/cmake/expat/

- )

- expat_install(

-     EXPORT

-         expat

-     DESTINATION

--        ${CMAKE_INSTALL_LIBDIR}/cmake/expat-${PROJECT_VERSION}/

-+        ${CMAKE_INSTALL_LIBDIR}/cmake/expat/

-     NAMESPACE

-         expat::

- )

diff --git a/ports/expat/pkgconfig.patch b/ports/expat/pkgconfig.patch
new file mode 100644
index 000000000..401daf737
--- /dev/null
+++ b/ports/expat/pkgconfig.patch
@@ -0,0 +1,15 @@
+diff --git a/expat/CMakeLists.txt b/expat/CMakeLists.txt
+index a67f081b1..cc220f2a1 100644
+--- a/expat/CMakeLists.txt
++++ b/expat/CMakeLists.txt
+@@ -294,7 +294,9 @@ expat_install(FILES lib/expat.h lib/expat_external.h DESTINATION ${CMAKE_INSTALL
+ #
+ # pkg-config file
+ #
++string(TOUPPER "${CMAKE_BUILD_TYPE}" BUILD_TYPE_UPPER)
++set(_EXPAT_OUTPUT_NAME ${_EXPAT_OUTPUT_NAME}${CMAKE_${BUILD_TYPE_UPPER}_POSTFIX})
+-if(NOT MSVC)
++if(1)
+     set(prefix ${CMAKE_INSTALL_PREFIX})
+     set(exec_prefix "\${prefix}")
+     set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}")
diff --git a/ports/expat/portfile.cmake b/ports/expat/portfile.cmake
index 1414344be..252d0f8ef 100644
--- a/ports/expat/portfile.cmake
+++ b/ports/expat/portfile.cmake
@@ -1,11 +1,11 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libexpat/libexpat
-    REF a7bc26b69768f7fb24f0c7976fae24b157b85b13 #tag 2.2.9
-    SHA512 18842d5c9ff89654c5beeb9daba7ff5a911da318d419735fb14a5acbe0d1b4ac07077822c70cfa5c845892bcec2d72f8f265b9a259fe459092864f4d1754f8dd
+    REF c092d40c300c6d219cb3b111932a824022265370 #Head from commit 2020-08-18
+    SHA512 5a5d41b500f5602a32aea8f4e15593e639206bb3f97553497e80b2975360cac88ac90386f5efc11728614f24bbb620fb908a3c8ca71c9e7b312f6157b2477afe
     HEAD_REF master
     PATCHES
-        fix-find-package-by-cmake.patch
+        pkgconfig.patch
 )
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
@@ -26,17 +26,12 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/expat)
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/expat-2.2.9)
+vcpkg_fixup_pkgconfig()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 
-file(GLOB EXE ${CURRENT_PACKAGES_DIR}/bin/*.exe)
-file(GLOB DEBUG_EXE ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe)
-if(EXE OR DEBUG_EXE)
-    file(REMOVE ${EXE} ${DEBUG_EXE})
-endif()
-
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/expat_external.h
         "! defined(XML_STATIC)"
@@ -47,4 +42,6 @@ endif()
 vcpkg_copy_pdbs()
 
 #Handle copyright
-file(INSTALL ${SOURCE_PATH}/expat/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file
+file(INSTALL ${SOURCE_PATH}/expat/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
diff --git a/ports/expat/vcpkg-cmake-wrapper.cmake b/ports/expat/vcpkg-cmake-wrapper.cmake
new file mode 100644
index 000000000..4d3e9e05d
--- /dev/null
+++ b/ports/expat/vcpkg-cmake-wrapper.cmake
@@ -0,0 +1,27 @@
+include(SelectLibraryConfigurations)

+

+set(EXPATNAMES expat expatw libexpat libexpatw)

+set(DEBUGNAMES)

+foreach(_CRT "" MT MD)

+    foreach(name IN LISTS EXPATNAMES)

+        list(APPEND EXPATNAMES ${name}${_CRT})

+        list(APPEND DEBUGNAMES ${name}d${_CRT})

+    endforeach()

+endforeach()

+

+find_library(EXPAT_LIBRARY_DEBUG NAMES ${DEBUGNAMES} ${EXPATNAMES} NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH)

+find_library(EXPAT_LIBRARY_RELEASE NAMES ${EXPATNAMES} NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH)

+select_library_configurations(EXPAT)

+set(EXPAT_LIBRARY "${EXPAT_LIBRARIES}" CACHE STRING "" FORCE)

+_find_package(${ARGS})

+if(EXPAT_FOUND AND TARGET EXPAT::EXPAT)

+    if(EXPAT_LIBRARY_DEBUG)

+        set_target_properties(EXPAT::EXPAT PROPERTIES IMPORTED_LOCATION_DEBUG "${EXPAT_LIBRARY_DEBUG}")

+    endif()

+    if(EXPAT_LIBRARY_RELEASE)

+        set_target_properties(EXPAT::EXPAT PROPERTIES IMPORTED_LOCATION_RELEASE "${EXPAT_LIBRARY_RELEASE}")

+    endif()

+endif()

+

+unset(EXPATNAMES)

+unset(DEBUGNAMES)
\ No newline at end of file