Fix osx baseline build failures (#9726)

* [xerces-c] Update REF and SHA512

* [sfml] re-trigger ci

* [pcl] re-trigger ci

* [boost-signals] re-trigger ci

* [tmxparser] re-trigger ci

* [soil2] switch repo to github

* [gtest] re-trigger ci

14 files changed, 21 insertions, 39 deletions

diff --git a/ports/boost-signals/CONTROL b/ports/boost-signals/CONTROL
index 5b58c978c..3c69f3c08 100644
--- a/ports/boost-signals/CONTROL
+++ b/ports/boost-signals/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1

 Source: boost-signals

-Version: 1.68.0

+Version: 1.68.0-1

 Build-Depends: boost-any, boost-build, boost-config, boost-core, boost-function, boost-iterator, boost-modular-build-helper, boost-optional, boost-smart-ptr, boost-type-traits, boost-utility, boost-vcpkg-helpers

 Homepage: https://github.com/boostorg/signals

 Description: Boost signals module

diff --git a/ports/boost-signals/portfile.cmake b/ports/boost-signals/portfile.cmake
index a5df93cdd..038d42dd7 100644
--- a/ports/boost-signals/portfile.cmake
+++ b/ports/boost-signals/portfile.cmake
@@ -1,7 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1

 

-include(vcpkg_common_functions)

-

 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO boostorg/signals

diff --git a/ports/gtest/CONTROL b/ports/gtest/CONTROL
index df050f22f..69f20c11d 100644
--- a/ports/gtest/CONTROL
+++ b/ports/gtest/CONTROL
@@ -1,4 +1,4 @@
 Source: gtest
-Version: 2019-10-09
+Version: 2019-10-09-1
 Homepage: https://github.com/google/googletest
 Description: GoogleTest and GoogleMock testing frameworks.
diff --git a/ports/gtest/portfile.cmake b/ports/gtest/portfile.cmake
index 183f049c5..5dd3bd506 100644
--- a/ports/gtest/portfile.cmake
+++ b/ports/gtest/portfile.cmake
@@ -1,5 +1,3 @@
-include(vcpkg_common_functions)
-
 if (EXISTS "${CURRENT_BUILDTREES_DIR}/src/.git")
     file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/src)
 endif()
@@ -48,7 +46,6 @@ file(
 )
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(INSTALL ${SOURCE_PATH}/googletest/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/gtest RENAME copyright)
 
 if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/gtest_maind.lib)
     file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link)
@@ -78,4 +75,5 @@ endif()
 
 vcpkg_copy_pdbs()
 
+file(INSTALL ${SOURCE_PATH}/googletest/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
diff --git a/ports/pcl/CONTROL b/ports/pcl/CONTROL
index 631aeebe0..9475fa417 100644
--- a/ports/pcl/CONTROL
+++ b/ports/pcl/CONTROL
@@ -1,5 +1,5 @@
 Source: pcl
-Version: 1.9.1-9
+Version: 1.9.1-10
 Homepage: https://github.com/PointCloudLibrary/pcl
 Description: Point Cloud Library (PCL) is open source library for 2D/3D image and point cloud processing.
 Build-Depends: eigen3, flann, qhull, vtk, libpng, boost-system, boost-filesystem, boost-thread, boost-date-time, boost-iostreams, boost-random, boost-foreach, boost-dynamic-bitset, boost-property-map, boost-graph, boost-multi-array, boost-signals2, boost-ptr-container, boost-uuid, boost-interprocess, boost-asio
diff --git a/ports/pcl/portfile.cmake b/ports/pcl/portfile.cmake
index b0dcd3ff9..cd358d41f 100644
--- a/ports/pcl/portfile.cmake
+++ b/ports/pcl/portfile.cmake
@@ -1,5 +1,3 @@
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO PointCloudLibrary/pcl
@@ -58,7 +56,7 @@ vcpkg_copy_pdbs()
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 
-if("tools" IN_LIST FEATURES)
+if("tools" IN_LIST FEATURES) 
     file(GLOB EXEFILES_RELEASE ${CURRENT_PACKAGES_DIR}/bin/*.exe)
     file(GLOB EXEFILES_DEBUG ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe)
     file(COPY ${EXEFILES_RELEASE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/pcl)
@@ -66,5 +64,4 @@ if("tools" IN_LIST FEATURES)
     vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/pcl)
 endif()
 
-file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/pcl)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/pcl/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/pcl/copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/sfml/CONTROL b/ports/sfml/CONTROL
index 9f5942639..a62fb278a 100644
--- a/ports/sfml/CONTROL
+++ b/ports/sfml/CONTROL
@@ -1,5 +1,5 @@
 Source: sfml
-Version: 2.5.1-5
+Version: 2.5.1-6
 Homepage: https://github.com/sfml/sfml
 Description: Simple and fast multimedia library
 Build-Depends: freetype, libflac, libogg, libvorbis, openal-soft, stb
diff --git a/ports/sfml/portfile.cmake b/ports/sfml/portfile.cmake
index ce2fc41fd..d6afbe2c3 100644
--- a/ports/sfml/portfile.cmake
+++ b/ports/sfml/portfile.cmake
@@ -54,4 +54,4 @@ endif()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)
 
-file(INSTALL ${SOURCE_PATH}/license.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/license.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file
diff --git a/ports/soil2/CONTROL b/ports/soil2/CONTROL
index c53cb77a5..07cfde7fb 100644
--- a/ports/soil2/CONTROL
+++ b/ports/soil2/CONTROL
@@ -1,3 +1,3 @@
 Source: soil2

-Version: release-1.11

+Version: release-1.11-1

 Description: Simple OpenGL Image Library 2
\ No newline at end of file
diff --git a/ports/soil2/portfile.cmake b/ports/soil2/portfile.cmake
index d54dcd7fc..e468c07cb 100644
--- a/ports/soil2/portfile.cmake
+++ b/ports/soil2/portfile.cmake
@@ -1,15 +1,11 @@
-include(vcpkg_common_functions)

-

-# Download the release-1.11 from bitbucket

-vcpkg_from_bitbucket(

+vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO SpartanJ/soil2

-    REF release-1.11

-    SHA512 203c2306fd72e24b9e990cb054f3b1b0391eaf26ed645842fb381971673dab8ea20c2739c8dff1fc11c83d6f66add0ad77ae79d8ff68930e3e1cb003e34f2414

+    REF 7dc42acee2302780c1e100bf864aa2bdb2221a2b #release-1.11

+    SHA512 13f1716a3766cb4fa8d5b90eae5f3795ed3c86fc4463ca1cd68f4fa6b7fd96c24ec5098673c1d7253c94bdd491854b9359f8ccb8bd5b5640eeff3605f52e17a5

     HEAD_REF master

 )

 

-# Copy the CMakeLists and LICENSE

 file(

     COPY 

     ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt

@@ -19,15 +15,13 @@ file(
     DESTINATION ${SOURCE_PATH}

 )

 

-# Configure the cmake file (we imported)

 vcpkg_configure_cmake(

     SOURCE_PATH ${SOURCE_PATH}

     PREFER_NINJA

     OPTIONS_DEBUG -DINSTALL_HEADERS=OFF

 )

 

-# Run the install

 vcpkg_install_cmake()

 

 # Handle copyright

-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/soil2 RENAME copyright)

+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

diff --git a/ports/tmxparser/CONTROL b/ports/tmxparser/CONTROL
index 7a3e3e2f8..44954e36e 100644
--- a/ports/tmxparser/CONTROL
+++ b/ports/tmxparser/CONTROL
@@ -1,4 +1,4 @@
 Source: tmxparser

-Version: 2.1.0-2

+Version: 2.1.0-3

 Description: C++11 library for parsing the maps generated by the Map Editor called Tiled.

 Build-Depends: zlib, tinyxml2

diff --git a/ports/tmxparser/portfile.cmake b/ports/tmxparser/portfile.cmake
index ffe58c89f..024d14d09 100644
--- a/ports/tmxparser/portfile.cmake
+++ b/ports/tmxparser/portfile.cmake
@@ -1,5 +1,3 @@
-include(vcpkg_common_functions)

-

 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO sainteos/tmxparser

@@ -34,4 +32,4 @@ else()
 endif()

 

 # Handle copyright

-configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/tmxparser/copyright COPYONLY)

+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

diff --git a/ports/xerces-c/CONTROL b/ports/xerces-c/CONTROL
index 6a7b0d216..d4fc58c4c 100644
--- a/ports/xerces-c/CONTROL
+++ b/ports/xerces-c/CONTROL
@@ -1,5 +1,5 @@
 Source: xerces-c
-Version: 3.2.2-11
+Version: 3.2.2-12
 Homepage: https://github.com/apache/xerces-c
 Description: Xerces-C++ is a XML parser, for parsing, generating, manipulating, and validating XML documents using the DOM, SAX, and SAX2 APIs.
 
diff --git a/ports/xerces-c/portfile.cmake b/ports/xerces-c/portfile.cmake
index 214cf971b..4ab19d126 100644
--- a/ports/xerces-c/portfile.cmake
+++ b/ports/xerces-c/portfile.cmake
@@ -1,10 +1,8 @@
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO apache/xerces-c
-    REF Xerces-C_3_2_2
-    SHA512 66f60fe9194376ac0ca99d13ea5bce23ada86e0261dde30686c21ceb5499e754dab8eb0a98adadd83522bda62709377715501f6dac49763e3a686f9171cc63ea
+    REF 71cc0e831b522933ae58253fcaf4423a166e6bec #3.2.2
+    SHA512 5ddaf84552cd1f685068352c12651780a9f4becd961d8efd0f1f6a21006df00ffb1afe9b9dd86a169f8c57c4f8b651d5477e1accfd7140a7a52aea14b23c9aed
     HEAD_REF trunk
     PATCHES
         disable-tests.patch
@@ -34,6 +32,8 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 
+vcpkg_copy_pdbs()
+
 if(EXISTS ${CURRENT_PACKAGES_DIR}/cmake)
     vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/xercesc)
 else()
@@ -64,7 +64,4 @@ file(REMOVE_RECURSE
 )
 
 # Handle copyright
-file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/xerces-c)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/xerces-c/LICENSE ${CURRENT_PACKAGES_DIR}/share/xerces-c/copyright)
-
-vcpkg_copy_pdbs()
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)