From 764ef46a9f84f5bfaf83d66ae7e861f7eb943610 Mon Sep 17 00:00:00 2001 From: Wesley Smith Date: Fri, 16 Aug 2024 15:00:01 -0700 Subject: [PATCH 1/3] bump imgui version to latest release --- CMakeLists.txt | 2 +- deps/imgui/imgui | 2 +- src/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 77dc97b9..52ed6fb3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5...3.22) +cmake_minimum_required(VERSION 3.12...3.22) project(polyscope) diff --git a/deps/imgui/imgui b/deps/imgui/imgui index 277ae93c..8199457a 160000 --- a/deps/imgui/imgui +++ b/deps/imgui/imgui @@ -1 +1 @@ -Subproject commit 277ae93c41314ba5f4c7444f37c4319cdf07e8cf +Subproject commit 8199457a7d9e453f8d3d9cadc14683fb54a858b5 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9d03d967..11fd7c85 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -362,7 +362,7 @@ install(TARGETS polyscope) install(DIRECTORY ${INCLUDE_ROOT}/ DESTINATION "${CMAKE_INSTALL_PREFIX}/include/polyscope") # Required compiler settings -set_property(TARGET polyscope PROPERTY CXX_STANDARD 11) +set_property(TARGET polyscope PROPERTY CXX_STANDARD 17) set_property(TARGET polyscope PROPERTY CXX_STANDARD_REQUIRED TRUE) set_target_properties(polyscope PROPERTIES POSITION_INDEPENDENT_CODE TRUE) add_definitions(-DNOMINMAX) From 0877a461f7ade62c23648eeff3bf53fa64fa1a37 Mon Sep 17 00:00:00 2001 From: Wesley Smith Date: Fri, 16 Aug 2024 15:15:28 -0700 Subject: [PATCH 2/3] fix obsolete enum --- src/imgui_config.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/imgui_config.cpp b/src/imgui_config.cpp index bc6df143..7b87f000 100644 --- a/src/imgui_config.cpp +++ b/src/imgui_config.cpp @@ -68,7 +68,7 @@ void configureImGuiStyle() { colors[ImGuiCol_DragDropTarget] = ImVec4(1.00f, 1.00f, 0.00f, 0.90f); colors[ImGuiCol_Tab] = ImVec4(0.27f, 0.54f, 0.42f, 0.83f); colors[ImGuiCol_TabHovered] = ImVec4(0.34f, 0.68f, 0.53f, 0.83f); - colors[ImGuiCol_TabActive] = ImVec4(0.38f, 0.76f, 0.58f, 0.83f); + colors[ImGuiCol_TabSelected] = ImVec4(0.38f, 0.76f, 0.58f, 0.83f); } From 3920a486b89f03ff2c12644c72f6ae219f4510c7 Mon Sep 17 00:00:00 2001 From: Wesley Smith Date: Sat, 17 Aug 2024 22:14:17 -0700 Subject: [PATCH 3/3] fix build --- deps/imgui/CMakeLists.txt | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/deps/imgui/CMakeLists.txt b/deps/imgui/CMakeLists.txt index ec877e5f..15901231 100644 --- a/deps/imgui/CMakeLists.txt +++ b/deps/imgui/CMakeLists.txt @@ -19,7 +19,16 @@ endif() if("${POLYSCOPE_BACKEND_OPENGL3_GLFW}") - set(SRCS imgui/imgui.cpp imgui/imgui_draw.cpp imgui/imgui_tables.cpp imgui/imgui_widgets.cpp imgui/imgui_demo.cpp imgui/backends/imgui_impl_glfw.cpp imgui/backends/imgui_impl_opengl3.cpp) + set(SRCS + imgui/imgui.cpp + imgui/imgui_draw.cpp + imgui/imgui_tables.cpp + imgui/imgui_widgets.cpp + imgui/imgui_demo.cpp + imgui/backends/imgui_impl_glfw.cpp + imgui/backends/imgui_impl_opengl3.cpp + imgui/misc/cpp/imgui_stdlib.cpp + ) add_library( imgui