Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Main2.0 #467

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Prev Previous commit
Next Next commit
WITH_EIGEN -> DGTAL_WITH_EIGEN
BDoignies committed Feb 12, 2025
commit e396e26514b3cde7425b27a9c77b2168129c83a8
4 changes: 2 additions & 2 deletions .github/workflows/buildAndDocumentation.yml
Original file line number Diff line number Diff line change
@@ -10,8 +10,8 @@ env:
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
BUILD_TYPE: Release
CONFIG_GLOBAL:
CONFIG_LINUX: -DWITH_MAGICK=true -DWITH_GMP=true -DDGTAL_WITH_FFTW3=true -DWARNING_AS_ERROR=ON -DDGTAL_WITH_HDF5=true -DWITH_QGLVIEWER=true -DDGTAL_WITH_CAIRO=true -DWITH_EIGEN=true -DDGTAL_ENABLE_FLOATING_POINT_EXCEPTIONS=true
CONFIG_MAC: -DWITH_EIGEN=true -DWITH_GMP=tue
CONFIG_LINUX: -DWITH_MAGICK=true -DWITH_GMP=true -DDGTAL_WITH_FFTW3=true -DWARNING_AS_ERROR=ON -DDGTAL_WITH_HDF5=true -DWITH_QGLVIEWER=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 -DENABLE_CONAN=true -DDISABLE_POLYSCOPE=ON #-DDGTAL_WITH_FFTW3=true #-DDGTAL_WITH_CAIRO=true #-DDGTAL_WITH_ITK=true -DWITH_GMP=true


4 changes: 2 additions & 2 deletions estimators/3dLocalEstimators.cpp
Original file line number Diff line number Diff line change
@@ -1175,8 +1175,8 @@ int main( int argc, char** argv )
#ifndef DGTAL_WITH_CGAL
#error You need to have activated CGAL (DGTAL_WITH_CGAL) to include this file.
#endif
#ifndef WITH_EIGEN
#error You need to have activated EIGEN (WITH_EIGEN) to include this file.
#ifndef DGTAL_WITH_EIGEN
#error You need to have activated EIGEN (DGTAL_WITH_EIGEN) to include this file.
#endif

// parse command line ----------------------------------------------
2 changes: 1 addition & 1 deletion estimators/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ SET(DGTAL_TOOLS_SRC
eulerCharacteristic
)

if (WITH_EIGEN)
if (DGTAL_WITH_EIGEN)
DGtalTools_add_tool(volSurfaceRegularization volSurfaceRegularization-details/surface_approx.cpp)
endif()

4 changes: 2 additions & 2 deletions imageProcessing/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

# These tools require Eigen (because DEC requires Eigen)
if(WITH_EIGEN)
if(DGTAL_WITH_EIGEN)
SET(DGTAL_TOOLS_SRC
at-u0-v1
at-u2-v0
@@ -9,4 +9,4 @@ if(WITH_EIGEN)
FOREACH(FILE ${DGTAL_TOOLS_SRC})
DGtalTools_add_tool(${FILE})
ENDFOREACH(FILE)
endif(WITH_EIGEN)
endif(DGTAL_WITH_EIGEN)