Merge pull request #1839 from DGtal-team/polyscope2.6

Author: dcoeurjo

ChangeLog.md

@@ -12,6 +12,9 @@
   - Many typos fixed in documentation using Github Copilot. (David Coeurjolly, [#1829](https://github.com/DGtal-team/DGtal/pull/1829))
   - Global spellcheck and pre-commit. (David Coeurjolly, [#1837](https://github.com/DGtal-team/DGtal/pull/1837))
 
+- *IO*
+  - Upgrading the polyscope backend to 2.6.1 (David Coeurjolly, [#1839](https://github.com/DGtal-team/DGtal/pull/1839))
+
 ## BugFixes
 
 - *IO*

cmake/DGtalConfig.cmake.in

@@ -64,6 +64,7 @@ if (@POLYSCOPE_FOUND_DGTAL@) #if POLYSCOPE_FOUND_DGTAL
   find_dependency(stb REQUIRED)
   find_dependency(nlohmann_json REQUIRED)
   find_dependency(MarchingCube REQUIRED)
+  find_dependency(IconFontCppHeaders REQUIRED)
   find_dependency(polyscope REQUIRED
     @POLYSCOPE_HINTS@
     )

cmake/deps/polyscope.cmake

@@ -7,7 +7,7 @@ set(CMAKE_CXX_FLAGS_DEBUG "-w")
 
 CPMAddPackage(
   NAME polyscope
-  VERSION 2.4.0
+  VERSION 2.6.1
   SYSTEM TRUE
   GITHUB_REPOSITORY "nmwsharp/polyscope"
 )
@@ -18,23 +18,34 @@ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG_OLD}")
 # points to build dir. This is forbidden by CMake (in install/export).
 # This function cleans INTERFACE_INCLUDE_DIRECTORIES to use generator expression
 # instead. It also provide the necessary install and exports.
+
 function(cleanup_target target include_paths)
   get_property(target_include_dir TARGET ${target} PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
   set_target_properties(${target} PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "")
+  
+  # For some reason, BUILD_INTERFACE is fucked up with list of paths given by imgui...
+  # For some other reason, some imgui includes path do not exist when this function is called
+  foreach(path ${target_include_dir})
+    string(FIND ${path} "<" POS)
+    if ((EXISTS ${path}) OR (${POS} EQUAL 1))
+      target_include_directories(${target}
+        INTERFACE
+          $<BUILD_INTERFACE:${path}>
+      )
+    endif()
+  endforeach()
+
   target_include_directories(${target}
     INTERFACE
-    $<BUILD_INTERFACE:${target_include_dir}>
-    $<INSTALL_INTERFACE:${DGTAL_INSTALL_DEPS_DESTINATION}/${target}>
+      $<INSTALL_INTERFACE:${DGTAL_INSTALL_DEPS_DESTINATION}/${target}>
   )
 
-  if (NOT ${include_paths})
-    foreach(path ${include_paths})
+  foreach(path ${include_paths})
       target_include_directories(${target}
         INTERFACE
           $<INSTALL_INTERFACE:${DGTAL_INSTALL_DEPS_DESTINATION}/${target}/${path}>
       )
-    endforeach()
-  endif()
+  endforeach()
 
   install(TARGETS ${target} EXPORT ${target}Targets)
   export(TARGETS ${target}
@@ -51,13 +62,13 @@ endfunction()
 
 # Polyscope dependencies
 # Only imgui have a different structure...
-cleanup_target(imgui "imgui/imgui")
+cleanup_target(imgui "imgui/imgui;imgui/implot;imgui/ImGuizmo")
 cleanup_target(glfw "")
 cleanup_target(glad "")
 cleanup_target(stb "")
 cleanup_target(glm "")
 cleanup_target(glm-header-only "")
 cleanup_target(nlohmann_json "")
 cleanup_target(MarchingCube "")
-
+cleanup_target(IconFontCppHeaders "")
 cleanup_target(polyscope "")