Update for recent versions. C++11. Backends moved to backends/ folder. Renamed reference to SDL to SDL2.

Author: ocornut

CMakeLists.txt

@@ -1,17 +1,18 @@
-cmake_minimum_required (VERSION 3.8.2)
+cmake_minimum_required (VERSION 3.10)
 project(imgui VERSION 1.73.0 LANGUAGES CXX C)
+set (CMAKE_CXX_STANDARD 11)
 
 option (IMGUI_EXAMPLES "Build ImGui examples" ON)
 option (IMGUI_DEMO "Include the ImGui demo window implementation in library" ON)
 
-option (IMGUI_IMPL_SDL "Build the SDL implementation (only if supported)" ON)
+option (IMGUI_IMPL_SDL2 "Build the SDL implementation (only if supported)" ON)
 option (IMGUI_IMPL_METAL "Build the Metal implementation (only if supported)" ${APPLE})
 option (IMGUI_IMPL_OSX "Build the OSX implementation (only if supported)" ${APPLE})
 option (IMGUI_IMPL_WIN32 "Build the Win32 (native winapi) implementation (only if supported)" ${WIN32})
 option (IMGUI_IMPL_GLFW "Build the GLFW implementation (only if supported)" ON)
 option (IMGUI_IMPL_GLUT "Build the GLUT implementation (only if supported)" ON)
-option (IMGUI_IMPL_OPENGL "Build the OpenGL implementation (only if supported)" ON)
-option (IMGUI_IMPL_OPENGL2 "Build the OpenGL 2 (legacy) implementation (only if supported)" ${IMGUI_IMPL_OPENGL})
+option (IMGUI_IMPL_OPENGL "Build the OpenGL3 implementation (only if supported)" ON)
+option (IMGUI_IMPL_OPENGL2 "Build the OpenGL2 (legacy) implementation (only if supported)" ${IMGUI_IMPL_OPENGL})
 option (IMGUI_IMPL_DX9 "Build the DirectX 9 implementation (only if supported)" ${WIN32})
 option (IMGUI_IMPL_DX10 "Build the DirectX 10 implementation (only if supported)" ${WIN32})
 option (IMGUI_IMPL_DX11 "Build the DirectX 11 implementation (only if supported)" ${WIN32})
@@ -20,6 +21,7 @@ option (IMGUI_IMPL_DX12 "Build the DirectX 12 implementation (only if supported)
 add_library (imgui
     imgui.cpp
     imgui_draw.cpp
+    imgui_tables.cpp
     imgui_widgets.cpp
     $<$<BOOL:IMGUI_DEMO>:imgui_demo.cpp>
 )
@@ -28,7 +30,7 @@ add_library(imgui::imgui ALIAS imgui)
 
 target_include_directories (imgui PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
 
-target_compile_features(imgui PRIVATE cxx_std_98)
+target_compile_features(imgui PRIVATE cxx_std_11)
 
 if (IMGUI_EXAMPLES)
     # Sets up polyfill libraries for Windows examples (e.g. GLFW)
@@ -39,38 +41,38 @@ if (NOT IMGUI_DEMO)
     target_compile_definitions (imgui PUBLIC -DIMGUI_DISABLE_DEMO_WINDOWS=1)
 endif ()
 
-if (IMGUI_IMPL_SDL)
-    include (examples/imgui_impl_sdl.cmake)
+if (IMGUI_IMPL_SDL2)
+    include (backends/imgui_impl_sdl2.cmake)
 endif ()
 if (IMGUI_IMPL_METAL)
-    include (examples/imgui_impl_metal.cmake)
+    include (backends/imgui_impl_metal.cmake)
 endif ()
 if (IMGUI_IMPL_OSX)
-    include (examples/imgui_impl_osx.cmake)
+    include (backends/imgui_impl_osx.cmake)
 endif ()
 if (IMGUI_IMPL_WIN32)
-    include (examples/imgui_impl_win32.cmake)
+    include (backends/imgui_impl_win32.cmake)
 endif ()
 if (IMGUI_IMPL_GLFW)
-    include (examples/imgui_impl_glfw.cmake)
+    include (backends/imgui_impl_glfw.cmake)
 endif ()
 if (IMGUI_IMPL_OPENGL OR IMGUI_IMPL_OPENGL2)
-    include (examples/imgui_impl_opengl.cmake)
+    include (backends/imgui_impl_opengl.cmake)
 endif ()
 if (IMGUI_IMPL_GLUT)
-    include (examples/imgui_impl_glut.cmake)
+    include (backends/imgui_impl_glut.cmake)
 endif ()
 if (IMGUI_IMPL_DX9)
-    include (examples/imgui_impl_dx9.cmake)
+    include (backends/imgui_impl_dx9.cmake)
 endif ()
 if (IMGUI_IMPL_DX10)
-    include (examples/imgui_impl_dx10.cmake)
+    include (backends/imgui_impl_dx10.cmake)
 endif ()
 if (IMGUI_IMPL_DX11)
-    include (examples/imgui_impl_dx11.cmake)
+    include (backends/imgui_impl_dx11.cmake)
 endif ()
 if (IMGUI_IMPL_DX12)
-    include (examples/imgui_impl_dx12.cmake)
+    include (backends/imgui_impl_dx12.cmake)
 endif ()
 
 if (IMGUI_EXAMPLES)
@@ -86,11 +88,11 @@ if (IMGUI_EXAMPLES)
     #add_subdirectory (examples/example_glfw_vulkan)
     add_subdirectory (examples/example_glut_opengl2)
     add_subdirectory (examples/example_null)
-    #add_subdirectory (examples/example_sdl_directx11)
-    add_subdirectory (examples/example_sdl_metal)
-    add_subdirectory (examples/example_sdl_opengl2)
-    add_subdirectory (examples/example_sdl_opengl3)
-    #add_subdirectory (examples/example_sdl_vulkan)
+    #add_subdirectory (examples/example_sdl2_directx11)
+    add_subdirectory (examples/example_sdl2_metal)
+    add_subdirectory (examples/example_sdl2_opengl2)
+    add_subdirectory (examples/example_sdl2_opengl3)
+    #add_subdirectory (examples/example_sdl2_vulkan)
     add_subdirectory (examples/example_win32_directx10)
     add_subdirectory (examples/example_win32_directx11)
     add_subdirectory (examples/example_win32_directx12)

examples/imgui_impl_dx10.cmake renamed to backends/imgui_impl_dx10.cmake

@@ -0,0 +1,19 @@
+find_package (OpenGL QUIET)
+
+if (OPENGL_gl_LIBRARY)
+    if (IMGUI_IMPL_OPENGL2)
+        add_library (imgui-opengl2 OBJECT
+            "${CMAKE_CURRENT_LIST_DIR}/imgui_impl_opengl2.cpp"
+        )
+
+        target_link_libraries (imgui-opengl2 PUBLIC
+            imgui
+            "${OPENGL_gl_LIBRARY}"
+        )
+
+        target_include_directories (imgui-opengl2 PUBLIC "${CMAKE_CURRENT_LIST_DIR}")
+        target_include_directories (imgui-opengl2 SYSTEM PUBLIC "${OPENGL_INCLUDE_DIR}")
+    endif ()
+else ()
+    message (WARNING "IMGUI_IMPL_OPENGL and/or IMGUI_IMPL_OPENGL2 set to ON but OpenGL could not be found")
+endif ()