Merge pull request #78099 from alef/cmake_imgui_stdlib

Add imgui_stdlib to CMake
CleverRaven · Nov 23, 2024 · b221f3e · b221f3e
2 parents 8460335 + 1b20f87
commit b221f3e
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 12 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -317,6 +317,18 @@ if (CURSES)
     if (WIN32 AND VCPKG_MANIFEST_MODE)
         find_package(unofficial-pdcurses CONFIG)
         if(TARGET unofficial::pdcurses::pdcurses)
+            get_target_property(_IMPORTED_CONFIGURATIONS unofficial::pdcurses::pdcurses
+                IMPORTED_CONFIGURATIONS
+            )
+            if (RELEASE AND "Release" IN_LIST _IMPORTED_CONFIGURATIONS)
+                get_target_property(_IMPORTED_LOCATION unofficial::pdcurses::pdcurses
+                IMPORTED_IMPLIB_RELEASE)
+            elseif("Debug" IN_LIST _IMPORTED_CONFIGURATIONS)
+                get_target_property(_IMPORTED_LOCATION unofficial::pdcurses::pdcurses
+                IMPORTED_IMPLIB_DEBUG)
+            endif()
+            set_target_properties(unofficial::pdcurses::pdcurses PROPERTIES
+                IMPORTED_LOCATION ${_IMPORTED_LOCATION})
             set(USE_PDCURSES TRUE)
         endif()
     elseif(MSYS2)

diff --git a/src/third-party/CMakeLists.txt b/src/third-party/CMakeLists.txt
@@ -66,21 +66,24 @@ if (TILES)
                 imgui
                 STATIC
                 imgui/imconfig.h
-                imgui/imgui_internal.h
+                imgui/imgui.cpp
                 imgui/imgui.h
-                imgui/imstb_rectpack.h
-                imgui/imstb_textedit.h
-                imgui/imstb_truetype.h
                 imgui/imgui_demo.cpp
                 imgui/imgui_draw.cpp
                 imgui/imgui_freetype.cpp
-                imgui/imgui_tables.cpp
-                imgui/imgui_widgets.cpp
-                imgui/imgui.cpp
+                imgui/imgui_freetype.h
                 imgui/imgui_impl_sdl2.cpp
                 imgui/imgui_impl_sdl2.h
                 imgui/imgui_impl_sdlrenderer2.cpp
                 imgui/imgui_impl_sdlrenderer2.h
+                imgui/imgui_internal.h
+                imgui/imgui_stdlib.cpp
+                imgui/imgui_stdlib.h
+                imgui/imgui_tables.cpp
+                imgui/imgui_widgets.cpp
+                imgui/imstb_rectpack.h
+                imgui/imstb_textedit.h
+                imgui/imstb_truetype.h
                 )
 
         target_include_directories(
@@ -131,16 +134,15 @@ if (CURSES)
                 imtui
                 STATIC
                 imgui/imconfig.h
-                imgui/imgui_internal.h
+                imgui/imgui.cpp
                 imgui/imgui.h
-                imgui/imstb_rectpack.h
-                imgui/imstb_textedit.h
-                imgui/imstb_truetype.h
                 imgui/imgui_demo.cpp
                 imgui/imgui_draw.cpp
+                imgui/imgui_internal.h
+                imgui/imgui_stdlib.cpp
+                imgui/imgui_stdlib.h
                 imgui/imgui_tables.cpp
                 imgui/imgui_widgets.cpp
-                imgui/imgui.cpp
                 imtui/imtui-impl-ncurses.cpp
                 imtui/imtui-impl-ncurses.h
                 imtui/imtui-impl-text.cpp