From d5824a7b9338d63e484dd5f6e74f8ea96181f810 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Thu, 19 Feb 2026 13:47:53 +0100 Subject: [PATCH] removing polyscope and use the polyscope shipped with DGtal --- .github/workflows/buildAndDocumentation.yml | 2 +- CMakeLists.txt | 16 ---------------- cmake/polyscope.cmake | 14 -------------- visualisation/CMakeLists.txt | 4 ++-- 4 files changed, 3 insertions(+), 33 deletions(-) delete mode 100644 cmake/polyscope.cmake diff --git a/.github/workflows/buildAndDocumentation.yml b/.github/workflows/buildAndDocumentation.yml index 6c58086f..75993862 100644 --- a/.github/workflows/buildAndDocumentation.yml +++ b/.github/workflows/buildAndDocumentation.yml @@ -12,7 +12,7 @@ env: CONFIG_GLOBAL: CONFIG_LINUX: -DWITH_MAGICK=true -DWITH_GMP=true -DDGTAL_WITH_FFTW3=true -DWARNING_AS_ERROR=ON -DDGTAL_WITH_HDF5=true -DDGTAL_WITH_CAIRO=true -DDGTAL_WITH_EIGEN=true -DDGTAL_ENABLE_FLOATING_POINT_EXCEPTIONS=true CONFIG_MAC: -DDGTAL_WITH_EIGEN=true -DWITH_GMP=tue - CONFIG_WINDOWS: -DDGTAL_WITH_OPENMP=true -DDISABLE_POLYSCOPE=ON + CONFIG_WINDOWS: -DDGTAL_WITH_OPENMP=true -DDGTAL_WITH_POLYSCOPE_VIEWER=OFF jobs: diff --git a/CMakeLists.txt b/CMakeLists.txt index a55e9d6c..a844f5ec 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,6 @@ LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake") SET(DGTALTOOLS_RANDOMIZED_BUILD_THRESHOLD "100" CACHE INTERNAL "Threshold for the random selection of tools to build.") SET(DGTALTOOLS_RANDOMIZED_BUILD_WHITELIST "" CACHE INTERNAL "List of whitelisted tools to build.") option(NO_ADD_STBIMAGE_IMPLEMENT "To avoid duplicated linking errors (like LNK2005 in MSVC)" OFF) -option(DISABLE_POLYSCOPE "Disable polyscope based tools" OFF) list(APPEND CMAKE_PREFIX_PATH "${DGtal_DIR}") # ----------------------------------------------------------------------------- @@ -103,21 +102,6 @@ if ( DGTAL_WITH_ITK ) include(${ITK_USE_FILE}) ENDIF( DGTAL_WITH_ITK ) - - -#----------------------------------------------------------------------------- -# polyscope -#----------------------------------------------------------------------------- -if (NOT(DISABLE_POLYSCOPE)) - message(STATUS "Enabling polyscope tools") - include(CPM) - include(polyscope) -else() - message(STATUS "Disabling polyscope tools") -endif() - - - # ----------------------------------------------------------------------------- # Documentation # ----------------------------------------------------------------------------- diff --git a/cmake/polyscope.cmake b/cmake/polyscope.cmake deleted file mode 100644 index 7ce4da45..00000000 --- a/cmake/polyscope.cmake +++ /dev/null @@ -1,14 +0,0 @@ -if (TARGET polyscope) - return() -endif() - -set(CMAKE_CXX_FLAGS_DEBUG_OLD "${CMAKE_CXX_FLAGS_DEBUG}") -set(CMAKE_CXX_FLAGS_DEBUG "-w") - -CPMAddPackage( - NAME polyscope - VERSION 2.4.0 - GITHUB_REPOSITORY "nmwsharp/polyscope" -) - -set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG_OLD}") diff --git a/visualisation/CMakeLists.txt b/visualisation/CMakeLists.txt index 305293da..98b80c2f 100644 --- a/visualisation/CMakeLists.txt +++ b/visualisation/CMakeLists.txt @@ -33,13 +33,13 @@ if ( DGTAL_WITH_POLYSCOPE_VIEWER ) endif ( DGTAL_WITH_POLYSCOPE_VIEWER ) -if ( NOT(DISABLE_POLYSCOPE) ) +if ( DGTAL_WITH_POLYSCOPE_VIEWER ) SET(DGTALTOOLS_POLYSCOPE_SRC volscope) FOREACH(tool_file ${DGTALTOOLS_POLYSCOPE_SRC}) add_executable(${tool_file} ${tool_file}.cpp) - target_link_libraries (${tool_file} ${DGTAL_LIBRARIES} ${DGtalLibDependencies} ${DGtalToolsLibDependencies} polyscope) + target_link_libraries (${tool_file} ${DGtalToolsLibDependencies} DGtal::DGtal) install(TARGETS ${tool_file} RUNTIME DESTINATION bin LIBRARY DESTINATION lib