[catch2] Update to 3.1.1 (#27282)

* [catch2] Update to 3.1.1 * [catch2] Update version files
microsoft · Oct 19, 2022 · 58f4874 · 58f4874
1 parent 33ca2dc
commit 58f4874
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 50 deletions.
diff --git a/ports/catch2/fix-install-path.patch b/ports/catch2/fix-install-path.patch
@@ -1,7 +1,7 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -170,7 +170,7 @@
+@@ -164,7 +164,7 @@
 
      ## Provide some pkg-config integration
      set(PKGCONFIG_INSTALL_DIR
@@ -13,20 +13,19 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -356,12 +356,28 @@
+@@ -363,16 +363,28 @@
      install(
        TARGETS
          Catch2
 -        Catch2WithMain
        EXPORT
          Catch2Targets
--      DESTINATION
-+      LIBRARY DESTINATION
+       LIBRARY DESTINATION 
          ${CMAKE_INSTALL_LIBDIR}
-+      ARCHIVE DESTINATION
-+        ${CMAKE_INSTALL_LIBDIR}
-+      RUNTIME DESTINATION
-+        ${CMAKE_INSTALL_BINDIR}
+       ARCHIVE DESTINATION
+         ${CMAKE_INSTALL_LIBDIR}
+       RUNTIME DESTINATION
+         ${CMAKE_INSTALL_BINDIR}
      )
 +
 +     install(

diff --git a/ports/catch2/fix-uwp-build.patch b/ports/catch2/fix-uwp-build.patch
diff --git a/ports/catch2/portfile.cmake b/ports/catch2/portfile.cmake
@@ -1,17 +1,15 @@
-
 if(VCPKG_TARGET_IS_WINDOWS)
     vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 endif()
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO catchorg/Catch2
-    REF v3.1.0
-    SHA512 49e5339263190a6ef15284ef2dcc9e727ce0659cb750d4078024ccf6c6f339740a3a662273718ea73adfbc5928c3ef7268175ebda5ee9ec97ca58fed98747b44
+    REF v3.1.1
+    SHA512 d056c8bad8407364debff9f626c7f8255eb64e0faf6dc7fba3d7e14ed29a7e59bd45d92d7b3819bb67d6299a2024f5949c755995d98e94c9bb3d2013709e57ef
     HEAD_REF devel
     PATCHES
         fix-install-path.patch
-        fix-uwp-build.patch
 )
 
 vcpkg_cmake_configure(

diff --git a/ports/catch2/vcpkg.json b/ports/catch2/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "catch2",
-  "version-semver": "3.1.0",
-  "port-version": 1,
+  "version-semver": "3.1.1",
   "description": "A modern, header-only test framework for unit testing.",
   "homepage": "https://github.com/catchorg/Catch2",
   "license": "BSL-1.0",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -1313,8 +1313,8 @@
       "port-version": 1
     },
     "catch2": {
-      "baseline": "3.1.0",
-      "port-version": 1
+      "baseline": "3.1.1",
+      "port-version": 0
     },
     "cccapstone": {
       "baseline": "9b4128ee1153e78288a1b5433e2c06a0d47a4c4e",

diff --git a/versions/c-/catch2.json b/versions/c-/catch2.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "44a94453e68878bf44df00e51bae5115dff3baa8",
+      "version-semver": "3.1.1",
+      "port-version": 0
+    },
     {
       "git-tree": "286e5ac6cd8702b9b6cf6f486c35cc2516c7950b",
       "version-semver": "3.1.0",