Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/buildAndDocumentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
16 changes: 0 additions & 16 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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}")

# -----------------------------------------------------------------------------
Expand Down Expand Up @@ -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
# -----------------------------------------------------------------------------
Expand Down
14 changes: 0 additions & 14 deletions cmake/polyscope.cmake

This file was deleted.

4 changes: 2 additions & 2 deletions visualisation/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading