Separate include files (#2)

* Separate include files

CMakeLists.txt

@@ -10,60 +10,25 @@ option(IMGUI_USE_DARK_THEME "Use Dark ImGui Spectrum Theme" OFF)
 option(IMGUI_DEFINE_MATH_OPERATORS "Enable ImGui ImVec2/ImVec4 operators" OFF)
 option(IMGUI_BUILD_EXAMPLES "" OFF)
 
-add_library(imgui 
-    "${imgui_SOURCE_DIR}/imconfig.h"
-    "${imgui_SOURCE_DIR}/imgui.h"
-    "${imgui_SOURCE_DIR}/imgui.cpp"
-    "${imgui_SOURCE_DIR}/imgui_demo.cpp"
-    "${imgui_SOURCE_DIR}/imgui_draw.cpp"
-    "${imgui_SOURCE_DIR}/imgui_internal.h"
-    "${imgui_SOURCE_DIR}/imgui_tables.cpp"
-    "${imgui_SOURCE_DIR}/imgui_widgets.cpp"
-    "${imgui_SOURCE_DIR}/imstb_rectpack.h"
-    "${imgui_SOURCE_DIR}/imstb_textedit.h"
-    "${imgui_SOURCE_DIR}/imstb_truetype.h"
-    "${imgui_SOURCE_DIR}/backends/imgui_impl_opengl3.h"
-    "${imgui_SOURCE_DIR}/backends/imgui_impl_opengl3.cpp"
-    "${imgui_SOURCE_DIR}/backends/imgui_impl_glfw.h"
-    "${imgui_SOURCE_DIR}/backends/imgui_impl_glfw.cpp"
-    "${imgui_SOURCE_DIR}/misc/cpp/imgui_stdlib.h"
-    "${imgui_SOURCE_DIR}/misc/cpp/imgui_stdlib.cpp"
+add_library(imgui STATIC
+    imgui.cpp
+    imgui_demo.cpp
+    imgui_draw.cpp
+    imgui_tables.cpp
+    imgui_widgets.cpp
+    backends/imgui_impl_glfw.cpp
+    backends/imgui_impl_opengl3.cpp
 )
-add_library(imgui::imgui ALIAS imgui)
 
-if(IMGUI_USE_DARK_THEME)
-    target_compile_definitions(imgui PUBLIC SPECTRUM_USE_DARK_THEME)
-endif()
-if(IMGUI_DEFINE_MATH_OPERATORS)
-    target_compile_definitions(imgui PUBLIC IMGUI_DEFINE_MATH_OPERATORS)
-endif()
-target_compile_definitions(imgui PUBLIC
-    IMGUI_IMPL_OPENGL_LOADER_GL3W=1
-    IMGUI_DISABLE_OBSOLETE_FUNCTIONS # to check for obsolete functions
-    # IMGUI_USER_CONFIG="${PROJECT_SOURCE_DIR}/path/to/imconfig.h" # to use your own imconfig.h
+target_include_directories(imgui PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/backends
 )
-target_include_directories(imgui PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
-target_compile_features(imgui PUBLIC cxx_std_23)
 
-# the following should go in different files, but we're keeping things here to avoid future conflicts. 
-if(NOT TARGET glfw)
-    include(FetchContent)
-    FetchContent_Declare(
-        glfw
-        GIT_REPOSITORY https://github.com/glfw/glfw.git
-        GIT_TAG tags/3.3
-        GIT_SHALLOW TRUE
-    )
-
-    option(GLFW_BUILD_EXAMPLES "Build the GLFW example programs" OFF)
-    option(GLFW_BUILD_TESTS "Build the GLFW test programs" OFF)
-    option(GLFW_BUILD_DOCS "Build the GLFW documentation" OFF)
-    option(GLFW_INSTALL "Generate installation target" OFF)
-    option(GLFW_VULKAN_STATIC "Use the Vulkan loader statically linked into application" OFF)
-    FetchContent_MakeAvailable(glfw)
-endif()
+find_package(OpenGL REQUIRED)
+find_package(glfw3 REQUIRED)
 
-target_link_libraries(imgui PUBLIC glfw)
+target_link_libraries(imgui PUBLIC glfw OpenGL::GL)
 
 if(IMGUI_BUILD_EXAMPLES)
     add_executable(imgui_example

examples/example_glfw_opengl3/main.cpp

@@ -7,7 +7,7 @@
 // - Documentation        https://dearimgui.com/docs (same as your local docs/ folder).
 // - Introduction, links and more at the top of imgui.cpp
 
-#include "imgui.h"
+#include "include/imgui.h"
 #include "imgui_impl_glfw.h"
 #include "imgui_impl_opengl3.h"
 #include <stdio.h>

imgui.cpp

@@ -992,9 +992,9 @@ CODE
 #define IMGUI_DEFINE_MATH_OPERATORS
 #endif
 
-#include "imgui.h"
+#include "include/imgui.h"
 #ifndef IMGUI_DISABLE
-#include "imgui_internal.h"
+#include "include/imgui_internal.h"
 
 // System includes
 #include <stdio.h>      // vsnprintf, sscanf, printf

imgui_demo.cpp

@@ -99,7 +99,7 @@ Index of this file:
 #define _CRT_SECURE_NO_WARNINGS
 #endif
 
-#include "imgui.h"
+#include "include/imgui.h"
 #ifndef IMGUI_DISABLE
 
 // System includes

imgui_draw.cpp

@@ -31,9 +31,9 @@ Index of this file:
 #define IMGUI_DEFINE_MATH_OPERATORS
 #endif
 
-#include "imgui.h"
+#include "include/imgui.h"
 #ifndef IMGUI_DISABLE
-#include "imgui_internal.h"
+#include "include/imgui_internal.h"
 #ifdef IMGUI_ENABLE_FREETYPE
 #include "misc/freetype/imgui_freetype.h"
 #endif
@@ -123,7 +123,7 @@ namespace IMGUI_STB_NAMESPACE
 #ifdef IMGUI_STB_RECT_PACK_FILENAME
 #include IMGUI_STB_RECT_PACK_FILENAME
 #else
-#include "imstb_rectpack.h"
+#include "include/imstb_rectpack.h"
 #endif
 #endif
 
@@ -147,7 +147,7 @@ namespace IMGUI_STB_NAMESPACE
 #ifdef IMGUI_STB_TRUETYPE_FILENAME
 #include IMGUI_STB_TRUETYPE_FILENAME
 #else
-#include "imstb_truetype.h"
+#include "include/imstb_truetype.h"
 #endif
 #endif
 #endif // IMGUI_ENABLE_STB_TRUETYPE

imgui_tables.cpp

@@ -195,9 +195,9 @@ Index of this file:
 #define IMGUI_DEFINE_MATH_OPERATORS
 #endif
 
-#include "imgui.h"
+#include "include/imgui.h"
 #ifndef IMGUI_DISABLE
-#include "imgui_internal.h"
+#include "include/imgui_internal.h"
 
 // System includes
 #include <stdint.h>     // intptr_t

imgui_widgets.cpp

@@ -38,9 +38,9 @@ Index of this file:
 #define IMGUI_DEFINE_MATH_OPERATORS
 #endif
 
-#include "imgui.h"
+#include "include/imgui.h"
 #ifndef IMGUI_DISABLE
-#include "imgui_internal.h"
+#include "include/imgui_internal.h"
 
 // System includes
 #include <stdint.h>     // intptr_t
@@ -3863,7 +3863,7 @@ static bool STB_TEXTEDIT_INSERTCHARS(ImGuiInputTextState* obj, int pos, const Im
 
 #define IMSTB_TEXTEDIT_IMPLEMENTATION
 #define IMSTB_TEXTEDIT_memmove memmove
-#include "imstb_textedit.h"
+#include "include/imstb_textedit.h"
 
 // stb_textedit internally allows for a single undo record to do addition and deletion, but somehow, calling
 // the stb_textedit_paste() function creates two separate records, so we perform it manually. (FIXME: Report to nothings/stb?)

misc/cpp/imgui_stdlib.cpp

@@ -7,7 +7,7 @@
 // See more C++ related extension (fmt, RAII, syntaxis sugar) on Wiki:
 //   https://github.com/ocornut/imgui/wiki/Useful-Extensions#cness
 
-#include "imgui.h"
+#include "include/imgui.h"
 #include "imgui_stdlib.h"
 
 // Clang warnings with -Weverything