[libdisasm] Support uwp (microsoft#21815)

* [libdisasm] Support uwp * version * Add dependency vcpkg-cmake * version * [breakpad] drop support with uwp * version * use _CRT_SECURE_NO_WARNINGS instead * version
vitalyster · Dec 7, 2021 · 3579b5c · 3579b5c
1 parent 80bd733
commit 3579b5c
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 14 deletions.
diff --git a/ports/breakpad/vcpkg.json b/ports/breakpad/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "breakpad",
   "version-string": "2020-09-14",
-  "port-version": 3,
+  "port-version": 4,
   "description": "a set of client and server components which implement a crash-reporting system.",
   "homepage": "https://github.com/google/breakpad",
+  "supports": "!uwp",
   "dependencies": [
     "libdisasm"
   ]

diff --git a/ports/libdisasm/CMakeLists.txt b/ports/libdisasm/CMakeLists.txt
@@ -36,6 +36,10 @@ include_directories(libdisasm)
 
 add_library(libdisasm ${SRCS})
 
+if (MSVC)
+    target_compile_definitions(libdisasm PRIVATE _CRT_SECURE_NO_WARNINGS)
+endif()
+
 install(
   TARGETS libdisasm
   RUNTIME DESTINATION bin

diff --git a/ports/libdisasm/portfile.cmake b/ports/libdisasm/portfile.cmake
@@ -9,15 +9,15 @@ vcpkg_from_sourceforge(
     PATCHES sizeofvoid.patch
 )
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
 
-vcpkg_configure_cmake(
-  SOURCE_PATH ${SOURCE_PATH}
-  PREFER_NINJA
-  OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON
+vcpkg_cmake_configure(
+  SOURCE_PATH "${SOURCE_PATH}"
+  OPTIONS_DEBUG
+    -DDISABLE_INSTALL_HEADERS=ON
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
 # Handle copyright
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/libdisasm/vcpkg.json b/ports/libdisasm/vcpkg.json
@@ -1,7 +1,13 @@
 {
   "name": "libdisasm",
   "version-string": "0.23",
-  "port-version": 8,
+  "port-version": 9,
   "description": "x86 Disassembler Library.",
-  "homepage": "https://sourceforge.net/projects/bastard"
+  "homepage": "https://sourceforge.net/projects/bastard",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
 }
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
@@ -534,8 +534,6 @@ cpuid:x64-uwp=fail
 cpuid:arm64-windows=fail
 libdatrie:x64-linux=fail
 libdatrie:x64-osx=fail
-libdisasm:arm-uwp=fail
-libdisasm:x64-uwp=fail
 libdshowcapture:arm-uwp=fail
 libdshowcapture:x64-linux=fail
 libdshowcapture:x64-osx=fail

diff --git a/versions/b-/breakpad.json b/versions/b-/breakpad.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "553a7799e93f9f2b4441d077b379613a796acdea",
+      "version-string": "2020-09-14",
+      "port-version": 4
+    },
     {
       "git-tree": "be41998b0a407c10ae78d605264a2c0bb7d3f3ca",
       "version-string": "2020-09-14",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -1138,7 +1138,7 @@
     },
     "breakpad": {
       "baseline": "2020-09-14",
-      "port-version": 3
+      "port-version": 4
     },
     "brigand": {
       "baseline": "1.3.0",
@@ -3398,7 +3398,7 @@
     },
     "libdisasm": {
       "baseline": "0.23",
-      "port-version": 8
+      "port-version": 9
     },
     "libdivide": {
       "baseline": "5.0",

diff --git a/versions/l-/libdisasm.json b/versions/l-/libdisasm.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ab983230ac21cfc3d2849abfa70551755ffcb5f8",
+      "version-string": "0.23",
+      "port-version": 9
+    },
     {
       "git-tree": "a15a1eeb7daa3d47d553ba0b14a151462377c41f",
       "version-string": "0.23",