From 8984f677a501cd3f7b2956605b087c0a6ec608b9 Mon Sep 17 00:00:00 2001
From: Jacob Kahn <jacobkahn1@gmail.com>
Date: Tue, 18 May 2021 02:32:54 -0500
Subject: [PATCH] [flashlight-cpu] Update port (#17643)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [flashlight-cpu] Update port

* Ran x-add-version --overwrite-version

* Use vcpkg_Fixup_cmake_targets, remove usage

* overwrite version

* bump port version

* x-add-version

* Update versions/f-/flashlight-cpu.json

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
---
 ports/flashlight-cpu/portfile.cmake | 13 ++++++++-----
 ports/flashlight-cpu/vcpkg.json     |  1 +
 versions/baseline.json              |  2 +-
 versions/f-/flashlight-cpu.json     |  5 +++++
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/ports/flashlight-cpu/portfile.cmake b/ports/flashlight-cpu/portfile.cmake
index 49246dc8cc..0c10d9ba2f 100644
--- a/ports/flashlight-cpu/portfile.cmake
+++ b/ports/flashlight-cpu/portfile.cmake
@@ -1,17 +1,18 @@
-if (EXISTS "${CURRENT_INSTALLED_DIR}/share/flashlight-cuda")
-  message(FATAL_ERROR "flashlight-cuda is installed; only one Flashlight "
-    "backend package can be installed at once. Uninstall and try again:"
+if (EXISTS "${CURRENT_INSTALLED_DIR}/share/flashlight")
+  message(FATAL_ERROR "Only one of flashlight-cpu and flashlight-cuda"
+    "can be installed at once. Uninstall and try again:"
     "\n    vcpkg remove flashlight-cuda\n")
 endif()
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO flashlight/flashlight
-    REF 76f7fa7f5a162c73d6bf8befdb8e197a4dc7515d # 0.3 branch tip
-    SHA512 87786f9443d27ac9b513cf582caea13dccfa344e55a4970c0c2c7df7530260ad38cc578690ebf2fa256e8ea943abea547e0e6d5ee0ba090b336c4f7af8d2f53f
+    REF 626914e79073c5547513de649af706f7e2b796ad # 0.3 branch tip
+    SHA512 a22057cfa4cfe7acd95cbc5445a30870cce3cdde89066d1d75f40be0d73b069a49e89b226fe5337488cfe5618dd25958679c0636a3e4008312f01606328becfa
     HEAD_REF master
 )
 
+################################### Build ###################################
 # Default flags
 set(FL_DEFAULT_VCPKG_CMAKE_FLAGS
   -DFL_BUILD_TESTS=OFF
@@ -43,6 +44,8 @@ vcpkg_configure_cmake(
 )
 vcpkg_install_cmake()
 
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/flashlight-cpu TARGET_PATH share/flashlight)
+
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
diff --git a/ports/flashlight-cpu/vcpkg.json b/ports/flashlight-cpu/vcpkg.json
index 38b7846830..0b3940e963 100644
--- a/ports/flashlight-cpu/vcpkg.json
+++ b/ports/flashlight-cpu/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "flashlight-cpu",
   "version": "0.3",
+  "port-version": 1,
   "description": "A C++ standalone library for machine learning. CPU backend.",
   "homepage": "https://github.com/facebookresearch/flashlight",
   "supports": "!(windows | osx)",
diff --git a/versions/baseline.json b/versions/baseline.json
index d419f8575a..9d28f20aa3 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1990,7 +1990,7 @@
     },
     "flashlight-cpu": {
       "baseline": "0.3",
-      "port-version": 0
+      "port-version": 1
     },
     "flashlight-cuda": {
       "baseline": "0.3",
diff --git a/versions/f-/flashlight-cpu.json b/versions/f-/flashlight-cpu.json
index 79c3c9c921..52a6d21871 100644
--- a/versions/f-/flashlight-cpu.json
+++ b/versions/f-/flashlight-cpu.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "9de5ce0a5763ebc2b46378a46172b8cda7ac95c5",
+      "version": "0.3",
+      "port-version": 1
+    },
     {
       "git-tree": "63e05566899f6a034fb93cf6556cf3d5ca387f61",
       "version": "0.3",