[milerius-sfml-imgui] fix mac build (#22596)

microsoft · Jan 18, 2022 · 15f5077 · 15f5077
1 parent 888d8c0
commit 15f5077
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 14 deletions.
diff --git a/ports/milerius-sfml-imgui/cpp11.patch b/ports/milerius-sfml-imgui/cpp11.patch
@@ -0,0 +1,12 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 27b8bd8..ac65300 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -14,6 +14,7 @@ find_package(OpenGL REQUIRED)
+ ##! Library
+ add_library(${PROJECT_NAME} SHARED sfml-imgui/imgui-SFML.cpp)
+ target_link_libraries(${PROJECT_NAME} PUBLIC imgui::imgui sfml-graphics OpenGL::GL)
++target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_11)
+
+ target_include_directories(${PROJECT_NAME} PUBLIC
+         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/sfml-imgui>
diff --git a/ports/milerius-sfml-imgui/portfile.cmake b/ports/milerius-sfml-imgui/portfile.cmake
@@ -6,18 +6,18 @@ vcpkg_from_github(
     REF 1.1
     SHA512 191184f7b302f643bd7c241b69d9f9edc0d03c6f5a0b3a49f57ac84f3828202f8065291fb17993073a2c07f1237ba491de677c47e2f8160dc70ea77f20eb1946
     HEAD_REF master
-    PATCHES FixFindPackageIssue.patch
+    PATCHES
+        FixFindPackageIssue.patch
+        cpp11.patch
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
 )
 
-vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/milerius-sfml-imgui)
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/milerius-sfml-imgui)
 vcpkg_copy_pdbs()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/milerius-sfml-imgui)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/milerius-sfml-imgui/LICENSE ${CURRENT_PACKAGES_DIR}/share/milerius-sfml-imgui/copyright)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/milerius-sfml-imgui/vcpkg.json b/ports/milerius-sfml-imgui/vcpkg.json
@@ -1,10 +1,18 @@
 {
   "name": "milerius-sfml-imgui",
-  "version-string": "1.1",
-  "port-version": 3,
+  "version": "1.1",
+  "port-version": 4,
   "description": "imgui dll for sfml usage",
   "dependencies": [
     "imgui",
-    "sfml"
+    "sfml",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
   ]
 }
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
@@ -817,7 +817,6 @@ mhook:arm-uwp=fail
 mhook:x64-linux=fail
 mhook:x64-osx=fail
 mhook:x64-uwp=fail
-milerius-sfml-imgui:x64-osx=fail
 milerius-sfml-imgui:x64-windows-static=fail
 minhook:arm64-windows=fail
 minhook:arm-uwp=fail

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -4394,7 +4394,7 @@
     },
     "milerius-sfml-imgui": {
       "baseline": "1.1",
-      "port-version": 3
+      "port-version": 4
     },
     "mimalloc": {
       "baseline": "2.0.3",

diff --git a/versions/m-/milerius-sfml-imgui.json b/versions/m-/milerius-sfml-imgui.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4bfc198df4803019e174c0489fcc91e178f66930",
+      "version": "1.1",
+      "port-version": 4
+    },
     {
       "git-tree": "ecf4d9fd039390613094ab42564601f32f9982c3",
       "version-string": "1.1",