[imgui] imgui[glfw-binding]:wasm32-emscripten build fix (microsoft#30797

) * [imgui] fixed imgui[glfw-binding] build for emscripten (microsoft#30790) * [imgui] updated versions (microsoft#30790) * Updated imgui-config.cmake.in with suggested changes. * Updated git-tree.
sarvex · Apr 26, 2023 · 70992f6 · 70992f6
1 parent 40ab347
commit 70992f6
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 5 deletions.
diff --git a/ports/imgui/CMakeLists.txt b/ports/imgui/CMakeLists.txt
@@ -53,8 +53,10 @@ if(IMGUI_BUILD_DX12_BINDING)
 endif()
 
 if(IMGUI_BUILD_GLFW_BINDING)
-    find_package(glfw3 CONFIG REQUIRED)
-    target_link_libraries(${PROJECT_NAME} PUBLIC glfw)
+    if(NOT EMSCRIPTEN)
+        find_package(glfw3 CONFIG REQUIRED)
+        target_link_libraries(${PROJECT_NAME} PUBLIC glfw)
+    endif()
     target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_glfw.cpp)
 endif()
 

diff --git a/ports/imgui/imgui-config.cmake.in b/ports/imgui/imgui-config.cmake.in
@@ -5,7 +5,9 @@ cmake_policy(SET CMP0012 NEW)
 include(CMakeFindDependencyMacro)
 
 if (@IMGUI_BUILD_GLFW_BINDING@)
-    find_dependency(glfw3 CONFIG)
+    if (NOT "@EMSCRIPTEN@")
+        find_dependency(glfw3 CONFIG)
+    endif()
 endif()
 
 if (@IMGUI_BUILD_GLUT_BINDING@)

diff --git a/ports/imgui/vcpkg.json b/ports/imgui/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "imgui",
   "version": "1.89.4",
+  "port-version": 1,
   "description": "Bloat-free Immediate Mode Graphical User interface for C++ with minimal dependencies.",
   "homepage": "https://github.com/ocornut/imgui",
   "license": "MIT",
@@ -49,7 +50,10 @@
     "glfw-binding": {
       "description": "Make available GLFW binding",
       "dependencies": [
-        "glfw3"
+        {
+          "name": "glfw3",
+          "platform": "!emscripten"
+        }
       ]
     },
     "glut-binding": {

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -3270,7 +3270,7 @@
     },
     "imgui": {
       "baseline": "1.89.4",
-      "port-version": 0
+      "port-version": 1
     },
     "imgui-sfml": {
       "baseline": "2.5",

diff --git a/versions/i-/imgui.json b/versions/i-/imgui.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "68cf6847418f27dbd3ae70c557b1ef1357875fa1",
+      "version": "1.89.4",
+      "port-version": 1
+    },
     {
       "git-tree": "337ea84e098e85d4706ecdd807fe292933d9e6f8",
       "version": "1.89.4",