Various fixes

lifting-bits · Jul 12, 2022 · f978b09 · f978b09
1 parent 5ab4fe9
commit f978b09
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/ports/gap/portfile.cmake b/ports/gap/portfile.cmake
@@ -6,16 +6,16 @@ vcpkg_from_github(
   HEAD_REF main
 )
 
-vcpkg_configure_cmake(
+vcpkg_cmake_configure(
   SOURCE_PATH "${SOURCE_PATH}"
-  PREFER_NINJA
   OPTIONS
     -DGAP_ENABLE_COROUTINES=OFF
     -DENABLE_TESTING=OFF
     -DGAP_INSTALL=ON
+    -DUSE_SYSTEM_DEPENDENCIES=ON
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 vcpkg_cmake_config_fixup(
   PACKAGE_NAME "gap"
   CONFIG_PATH lib/cmake/gap

diff --git a/ports/gap/vcpkg.json b/ports/gap/vcpkg.json
@@ -1,11 +1,14 @@
 {
     "name": "gap",
     "version": "0.0.0",
-    "port-version": 1,
     "description": "A utility library to bridge llvm and mlir gaps",
     "homepage": "https://github.com/lifting-bits/gap",
-    "license": "MIT",
+    "license": "Apache-2.0",
     "dependencies": [
+        {
+            "name": "vcpkg-cmake",
+            "host": true
+        },
         {
             "name": "vcpkg-cmake-config",
             "host": true

diff --git a/ports/remill/portfile.cmake b/ports/remill/portfile.cmake
@@ -6,12 +6,13 @@ vcpkg_from_github(
   HEAD_REF vcpkg-manifest
 )
 
-vcpkg_configure_cmake(
+vcpkg_cmake_configure(
   SOURCE_PATH "${SOURCE_PATH}"
-  PREFER_NINJA
+  OPTIONS
+    -DUSE_SYSTEM_DEPENDENCIES=ON
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 vcpkg_cmake_config_fixup(
   PACKAGE_NAME "remill"
   CONFIG_PATH lib/cmake/remill

diff --git a/ports/remill/vcpkg.json b/ports/remill/vcpkg.json
@@ -1,11 +1,14 @@
 {
     "name": "remill",
     "version": "5.0.2",
-    "port-version": 1,
     "description": "A static binary translator.",
     "homepage": "https://github.com/lifting-bits/remill",
     "license": "Apache-2.0",
     "dependencies": [
+        {
+            "name": "vcpkg-cmake",
+            "host": true
+        },
         {
             "name": "vcpkg-cmake-config",
             "host": true