From 93c815ff34c4a1d5d72f57269b213f4128fd4c46 Mon Sep 17 00:00:00 2001
From: Ada Tufankjian <amt3824@g.rit.edu>
Date: Sat, 31 Aug 2024 22:58:50 -0700
Subject: [PATCH] [enkits] Fixing version 1.11 not properly configured to work
 as a dynamic library (#40715)

---
 ports/enkits/fix_shared_install.patch | 13 ++++++++++
 ports/enkits/portfile.cmake           | 10 +++-----
 ports/enkits/update_install.patch     | 35 ---------------------------
 ports/enkits/vcpkg.json               |  2 +-
 versions/baseline.json                |  2 +-
 versions/e-/enkits.json               |  5 ++++
 6 files changed, 24 insertions(+), 43 deletions(-)
 create mode 100644 ports/enkits/fix_shared_install.patch
 delete mode 100644 ports/enkits/update_install.patch

diff --git a/ports/enkits/fix_shared_install.patch b/ports/enkits/fix_shared_install.patch
new file mode 100644
index 0000000000..1d69d498ea
--- /dev/null
+++ b/ports/enkits/fix_shared_install.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0c12562..e15f863 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -85,6 +85,8 @@ if( ENKITS_INSTALL )
+     install(
+         TARGETS enkiTS
+         EXPORT enkiTSConfig
++        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+     install(FILES ${ENKITS_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/enkiTS)
+     install(
diff --git a/ports/enkits/portfile.cmake b/ports/enkits/portfile.cmake
index 7f0367dac0..c9b9237807 100644
--- a/ports/enkits/portfile.cmake
+++ b/ports/enkits/portfile.cmake
@@ -1,11 +1,11 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO dougbinks/enkiTS
-    REF "v${VERSION}"
-    SHA512 72a05058caef8d6a33cd70500aeaf05cc61521721697969d4845279b5a79b63e7a6a3f3971c5eff2776e5575720b58252e9d251ef565c2123275a3e8540948db
+    REF "03e6a2c0c97208ade44478d617d2002b0f95faf4"
+    SHA512 2889a7b015319115f6acf74036f709b30786602f3b7205bdf401644172e2d92307f325719ccc02ad93a09557a9155e31db4d8e07f9f77e0c700d5a3365091ad3
     HEAD_REF master
     PATCHES
-        update_install.patch
+        fix_shared_install.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED)
@@ -22,9 +22,7 @@ vcpkg_cmake_configure(
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 vcpkg_fixup_pkgconfig()
-# Must specify args due to case sensitivity on some filesystems
-vcpkg_cmake_config_fixup(PACKAGE_NAME enkiTS CONFIG_PATH share/enkiTS)
-file(RENAME "${CURRENT_PACKAGES_DIR}/share/enkiTS/enkiTS-config.cmake" "${CURRENT_PACKAGES_DIR}/share/enkiTS/enkiTSConfig.cmake")
+vcpkg_cmake_config_fixup(PACKAGE_NAME enkiTS CONFIG_PATH lib/cmake/enkiTS)
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/ports/enkits/update_install.patch b/ports/enkits/update_install.patch
deleted file mode 100644
index 0a06d61bce..0000000000
--- a/ports/enkits/update_install.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7f8572e..f42ec18 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 3.0)
- 
- project( enkiTS )
- 
-+include(GNUInstallDirs)
-+
- option( ENKITS_BUILD_C_INTERFACE    "Build C interface" ON )
- option( ENKITS_BUILD_EXAMPLES       "Build example applications" ON )
- option( ENKITS_BUILD_SHARED         "Build shared library" OFF )
-@@ -59,9 +63,19 @@ if( UNIX )
-     target_link_libraries( enkiTS ${CMAKE_THREAD_LIBS_INIT} )
- endif()
- 
-+target_include_directories(enkiTS PUBLIC "$<INSTALL_INTERFACE:include>")
- if( ENKITS_INSTALL )
--    install(TARGETS enkiTS DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/enkiTS")
--    install(FILES ${ENKITS_HEADERS} DESTINATION "${CMAKE_INSTALL_PREFIX}/include/enkiTS")
-+    install(
-+        TARGETS enkiTS
-+        EXPORT enkiTS-config
-+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+    install(FILES ${ENKITS_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-+    install(
-+        EXPORT enkiTS-config
-+        NAMESPACE enkiTS::
-+        DESTINATION ${CMAKE_INSTALL_DATADIR}/enkiTS)
- endif()
- 
- if( UNIX )
diff --git a/ports/enkits/vcpkg.json b/ports/enkits/vcpkg.json
index 9888cdbe2b..4b5fc3b814 100644
--- a/ports/enkits/vcpkg.json
+++ b/ports/enkits/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "enkits",
   "version": "1.11",
-  "port-version": 2,
+  "port-version": 3,
   "description": "A permissively licensed C and C++ Task Scheduler for creating parallel programs.",
   "homepage": "https://github.com/dougbinks/enkiTS",
   "license": "Zlib",
diff --git a/versions/baseline.json b/versions/baseline.json
index 94914a8edb..abf7670f02 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2538,7 +2538,7 @@
     },
     "enkits": {
       "baseline": "1.11",
-      "port-version": 2
+      "port-version": 3
     },
     "ensmallen": {
       "baseline": "2.19.1",
diff --git a/versions/e-/enkits.json b/versions/e-/enkits.json
index e90969dcc5..b3d0b47ff3 100644
--- a/versions/e-/enkits.json
+++ b/versions/e-/enkits.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7f702d4ff681f810a7100c4dea92ecc121923894",
+      "version": "1.11",
+      "port-version": 3
+    },
     {
       "git-tree": "8fc05799f3650a3e68dda59c7d6c813e5e49408e",
       "version": "1.11",