From 3c69ad28c62d37d0534a60a53c4e6b014e408c54 Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Sun, 20 Nov 2022 18:35:04 -0600 Subject: [PATCH] Add imgui dependency --- .gitmodules | 3 +++ external/CMakeLists.txt | 2 ++ external/imgui | 1 + external/imgui.cmake | 24 ++++++++++++++++++++++++ scwx-qt/scwx-qt.cmake | 2 ++ 5 files changed, 32 insertions(+) create mode 160000 external/imgui create mode 100644 external/imgui.cmake diff --git a/.gitmodules b/.gitmodules index 6428f061..debb3932 100644 --- a/.gitmodules +++ b/.gitmodules @@ -19,3 +19,6 @@ [submodule "data"] path = data url = ../supercell-wx-data +[submodule "external/imgui"] + path = external/imgui + url = https://github.com/ocornut/imgui.git diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 7e7c320a..c1f00736 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -6,10 +6,12 @@ set_property(DIRECTORY PROPERTY CMAKE_CONFIGURE_DEPENDS freetype-gl.cmake hsluv-c.cmake + imgui.cmake mapbox-gl-native.cmake stb.cmake) include(freetype-gl.cmake) include(hsluv-c.cmake) +include(imgui.cmake) include(mapbox-gl-native.cmake) include(stb.cmake) diff --git a/external/imgui b/external/imgui new file mode 160000 index 00000000..81160fee --- /dev/null +++ b/external/imgui @@ -0,0 +1 @@ +Subproject commit 81160fee56027226bc80b48e196d0332f5541a8c diff --git a/external/imgui.cmake b/external/imgui.cmake new file mode 100644 index 00000000..8f6d4d82 --- /dev/null +++ b/external/imgui.cmake @@ -0,0 +1,24 @@ +cmake_minimum_required(VERSION 3.20) +set(PROJECT_NAME scwx-imgui) + +set(IMGUI_SOURCES imgui/imconfig.h + imgui/imgui.cpp + imgui/imgui.h + imgui/imgui_demo.cpp + imgui/imgui_draw.cpp + imgui/imgui_internal.h + imgui/imgui_tables.cpp + imgui/imgui_widgets.cpp + imgui/imstb_rectpack.h + imgui/imstb_textedit.h + imgui/imstb_truetype.h + imgui/backends/imgui_impl_opengl3.cpp + imgui/backends/imgui_impl_opengl3.h) + +add_library(imgui STATIC ${IMGUI_SOURCES}) + +target_include_directories(imgui PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/imgui) + +set(IMGUI_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/imgui PARENT_SCOPE) + +set_target_properties(imgui PROPERTIES FOLDER imgui) diff --git a/scwx-qt/scwx-qt.cmake b/scwx-qt/scwx-qt.cmake index 5a9c74f8..b4163326 100644 --- a/scwx-qt/scwx-qt.cmake +++ b/scwx-qt/scwx-qt.cmake @@ -293,6 +293,7 @@ endif() target_include_directories(scwx-qt PUBLIC ${scwx-qt_SOURCE_DIR}/source ${FTGL_INCLUDE_DIR} + ${IMGUI_INCLUDE_DIR} ${MBGL_INCLUDE_DIR} ${STB_INCLUDE_DIR}) @@ -316,6 +317,7 @@ target_link_libraries(scwx-qt PUBLIC Qt${QT_VERSION_MAJOR}::Widgets freetype-gl GeographicLib::GeographicLib glm::glm + imgui SQLite::SQLite3 wxdata)