From 9835eb1dfd117536dad86289e6d525d8ab40bbda Mon Sep 17 00:00:00 2001
From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com>
Date: Fri, 3 Jun 2022 06:13:27 +0800
Subject: [PATCH] [b64] Add target include directories and export config.cmake
 (#25037)

* [b64] Add target include directories and export config.cmake

* Use unofficial-b64

Co-authored-by: Cheney-Wang <v-xincwa@microsoft.com>
---
 ports/b64/CMakeLists.txt | 15 ++++++++++-----
 ports/b64/portfile.cmake |  2 +-
 ports/b64/vcpkg.json     |  2 ++
 versions/b-/b64.json     |  5 +++++
 versions/baseline.json   |  2 +-
 5 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/ports/b64/CMakeLists.txt b/ports/b64/CMakeLists.txt
index 274fc0788b..e40d14ef38 100644
--- a/ports/b64/CMakeLists.txt
+++ b/ports/b64/CMakeLists.txt
@@ -18,18 +18,23 @@ if (BUILD_SHARED_LIBS)
     target_compile_definitions(b64 PRIVATE LIBB64_EXPORTS=1)
 endif()
 
-target_include_directories(b64 PRIVATE include ${CMAKE_CURRENT_BINARY_DIR})
+target_include_directories(b64
+    PRIVATE include ${CMAKE_CURRENT_BINARY_DIR}
+    INTERFACE $<INSTALL_INTERFACE:include>
+)
 
 set_property(TARGET b64 
             PROPERTY PUBLIC_HEADER ${HEADER_FILES})
 
 install(TARGETS b64
-	EXPORT b64-targets
+	EXPORT unofficial-b64-config
     LIBRARY DESTINATION lib
     PUBLIC_HEADER DESTINATION include/b64
 )
 
-install(EXPORT b64-targets 
-	FILE b64-targets.cmake
-	DESTINATION lib/cmake/b64)
+install(EXPORT unofficial-b64-config
+    FILE unofficial-b64-config.cmake
+    NAMESPACE unofficial::b64::
+    DESTINATION share/unofficial-b64
+)
 
diff --git a/ports/b64/portfile.cmake b/ports/b64/portfile.cmake
index dbe41a9372..51ba61141f 100644
--- a/ports/b64/portfile.cmake
+++ b/ports/b64/portfile.cmake
@@ -19,7 +19,7 @@ vcpkg_cmake_install()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
+vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-b64)
 
 vcpkg_copy_pdbs()
 
diff --git a/ports/b64/vcpkg.json b/ports/b64/vcpkg.json
index ba4dba7a21..6c9d51104f 100644
--- a/ports/b64/vcpkg.json
+++ b/ports/b64/vcpkg.json
@@ -2,7 +2,9 @@
   "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json",
   "name": "b64",
   "version": "2.0.0.1",
+  "port-version": 1,
   "description": "libb64 is a library of ANSI C routines for fast encoding/decoding data into and from a base64-encoded format",
+  "license": null,
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/versions/b-/b64.json b/versions/b-/b64.json
index 36e172140e..590f69c2b6 100644
--- a/versions/b-/b64.json
+++ b/versions/b-/b64.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "aeaf7d2076e25b321032c4fc88c22cbb46002a90",
+      "version": "2.0.0.1",
+      "port-version": 1
+    },
     {
       "git-tree": "9f1b6b36747fb6349483bf78531123d4b1ec5d7d",
       "version": "2.0.0.1",
diff --git a/versions/baseline.json b/versions/baseline.json
index c7482f9b6b..98ae4410fb 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -394,7 +394,7 @@
     },
     "b64": {
       "baseline": "2.0.0.1",
-      "port-version": 0
+      "port-version": 1
     },
     "basisu": {
       "baseline": "1.11",