DGTAL cmake variables prefixed with DGTAL_

.github/workflows/build-master.yml

@@ -2,15 +2,15 @@ name: CI (linux/macOS/windows), master
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master, main2.0 ]
 
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
   TESTBLACKLIST: "(testLinearStructure|testIntegerConverter|testArithmeticalDSSComputerOnSurfels)"
-  CONFIG_GLOBAL:  -DBUILD_EXAMPLES=true -DBUILD_TESTING=true -DDGTAL_RANDOMIZED_TESTING_THRESHOLD=10 -DWITH_EIGEN=true 
-  CONFIG_LINUX:   -DWITH_OPENMP=true -DWITH_GMP=true -DWITH_FFTW3=true -DWITH_CGAL=true -DWITH_LIBIGL=true  -DWARNING_AS_ERROR=ON -DWITH_HDF5=true -DWITH_QGLVIEWER=true -DWITH_CAIRO=true   -DWITH_ITK=true -DDGTAL_ENABLE_FLOATING_POINT_EXCEPTIONS=true -DBUILD_POLYSCOPE_EXAMPLES=true
-  CONFIG_MAC:     -DWITH_GMP=true -DBUILD_POLYSCOPE_EXAMPLES=true -DWITH_CGAL=true -DWITH_LIBIGL=true 
-  CONFIG_WINDOWS: -DWITH_OPENMP=true  #-DWITH_GMP=true #-DWITH_FFTW3=true  #-DWITH_CAIRO=true #-DWITH_ITK=true  
+  CONFIG_GLOBAL:  -DDGTAL_BUILD_EXAMPLES=true -DDGTAL_BUILD_TESTS=true -DDGTAL_RANDOMIZED_TESTING_THRESHOLD=10  
+  CONFIG_LINUX:   -DDGTAL_WITH_OPENMP=true -DDGTAL_WITH_GMP=true -DDGTAL_WITH_FFTW3=true -DDGTAL_WITH_CGAL=true -DDGTAL_WITH_LIBIGL=true  -DWARNING_AS_ERROR=ON -DDGTAL_WITH_HDF5=true -DWITH_QGLVIEWER=true  -DDGTAL_WITH_CAIRO=true    -DDGTAL_WITH_ITK=true -DDGTAL_ENABLE_FLOATING_POINT_EXCEPTIONS=true -DDGTAL_BUILD_POLYSCOPE_EXAMPLES=true
+  CONFIG_MAC:     -DDGTAL_WITH_GMP=true -DDGTAL_BUILD_POLYSCOPE_EXAMPLES=true -DDGTAL_WITH_CGAL=true  -DDGTAL_WITH_LIBIGL=true 
+  CONFIG_WINDOWS: -DDGTAL_WITH_OPENMP=true  #-DDGTAL_WITH_GMP=true #-DDGTAL_WITH_FFTW3=true  # -DDGTAL_WITH_CAIRO=true # -DDGTAL_WITH_ITK=true  
 
 jobs:
   build:

.github/workflows/buildAndDocumentation-PR.yml

@@ -2,15 +2,15 @@ name: CI (linux/macOS/windows), PR
 
 on:
   pull_request:
-    branches: [ master ]
+    branches: [ master, main2.0 ]
 
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
   TESTBLACKLIST: "(testLinearStructure|testIntegerConverter|testArithmeticalDSSComputerOnSurfels)"
-  CONFIG_GLOBAL:  -DBUILD_EXAMPLES=true -DBUILD_TESTING=true -DDGTAL_RANDOMIZED_TESTING_THRESHOLD=10 -DWITH_EIGEN=true
-  CONFIG_LINUX:   -DUSE_CCACHE=NO -DWITH_OPENMP=true -DWITH_GMP=true -DWITH_CGAL=true -DWITH_LIBIGL=true -DWITH_FFTW3=true -DWARNING_AS_ERROR=ON -DWITH_HDF5=true -DWITH_QGLVIEWER=true -DWITH_CAIRO=true   -DWITH_ITK=true -DDGTAL_ENABLE_FLOATING_POINT_EXCEPTIONS=true -DBUILD_POLYSCOPE_EXAMPLES=true
-  CONFIG_MAC:     -DUSE_CCACHE=NO -DWITH_GMP=true -DBUILD_POLYSCOPE_EXAMPLES=true -DWITH_CGAL=true -DWITH_LIBIGL=true
-  CONFIG_WINDOWS: -DWITH_OPENMP=true   #-DWITH_GMP=true #-DWITH_FFTW3=true  #-DWITH_CAIRO=true #-DWITH_ITK=true 
+  CONFIG_GLOBAL:  -DDGTAL_BUILD_EXAMPLES=true -DDGTAL_BUILD_TESTS=true -DDGTAL_RANDOMIZED_TESTING_THRESHOLD=10 
+  CONFIG_LINUX:   -DUSE_CCACHE=NO -DDGTAL_WITH_OPENMP=true -DDGTAL_WITH_GMP=true -DDGTAL_WITH_CGAL=true  -DDGTAL_WITH_LIBIGL=true -DDGTAL_WITH_FFTW3=true -DWARNING_AS_ERROR=ON -DDGTAL_WITH_HDF5=true -DWITH_QGLVIEWER=true  -DDGTAL_WITH_CAIRO=true -DDGTAL_WITH_ITK=true -DDGTAL_ENABLE_FLOATING_POINT_EXCEPTIONS=true -DDGTAL_BUILD_POLYSCOPE_EXAMPLES=true
+  CONFIG_MAC:     -DUSE_CCACHE=NO -DDGTAL_WITH_GMP=true -DDGTAL_BUILD_POLYSCOPE_EXAMPLES=true -DDGTAL_WITH_CGAL=true  -DDGTAL_WITH_LIBIGL=true
+  CONFIG_WINDOWS: -DDGTAL_WITH_OPENMP=true   #-DDGTAL_WITH_GMP=true -DDGTAL_WITH_FFTW3=true  -DDGTAL_WITH_CAIRO=true -DDGTAL_WITH_ITK=true 
 
 jobs:
   build:

.github/workflows/commands.yml

@@ -78,7 +78,7 @@ jobs:
         if: steps.get_round.outputs.result == 'builddoc'
         run: |
           set -ex
-          mkdir -p build_doc && cd build_doc && cmake .. -DBUILD_EXAMPLES=true -DBUILD_TESTING=true
+          mkdir -p build_doc && cd build_doc && cmake .. -DDGTAL_BUILD_EXAMPLES=true -DDGTAL_BUILD_TESTS=true
 
 
       - name: build doc
@@ -214,7 +214,7 @@ jobs:
         if: steps.get_round.outputs.result == 'fullbuild'
         run: |
           cmake -E make_directory ${{runner.workspace}}/build
-          cmake -S ${{runner.workspace}}/DGtal -B ${{runner.workspace}}/build -DBUILD_EXAMPLES=true -DBUILD_TESTING=true -DDGTAL_RANDOMIZED_TESTING_THRESHOLD=100 -DWITH_OPENMP=true -DWITH_GMP=true -DWITH_FFTW3=true -DWARNING_AS_ERROR=ON -DWITH_HDF5=true -DWITH_QGLVIEWER=true -DWITH_CAIRO=true  -DWITH_EIGEN=true  -DWITH_ITK=true -DDGTAL_ENABLE_FLOATING_POINT_EXCEPTIONS=true -G Ninja
+          cmake -S ${{runner.workspace}}/DGtal -B ${{runner.workspace}}/build -DDGTAL_BUILD_EXAMPLES=true -DDGTAL_BUILD_TESTS=true -DDGTAL_RANDOMIZED_TESTING_THRESHOLD=100 -DDGTAL_WITH_OPENMP=true -DDGTAL_WITH_GMP=true -DDGTAL_WITH_FFTW3=true -DWARNING_AS_ERROR=ON - DDGTAL_WITH_HDF5=true -DWITH_QGLVIEWER=true  -DDGTAL_WITH_CAIRO=true -DDGTAL_WITH_ITK=true -DDGTAL_ENABLE_FLOATING_POINT_EXCEPTIONS=true -G Ninja
           cd ${{runner.workspace}}/build
           cmake --build .
           export TESTBLACKLIST="(testLinearStructure)"

.github/workflows/pythonBindings-PR.yml

@@ -2,16 +2,16 @@ name: CI Python bindings (linux/macOS/windows)
 
 on:
   pull_request:
-    branches: [ master ]
+    branches: [ master, main2.0 ]
 
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
   TESTBLACKLIST: "(testLinearStructure|testIntegerConverter|testArithmeticalDSSComputerOnSurfels)"
-  CONFIG_GLOBAL:  -DBUILD_EXAMPLES=false -DBUILD_TESTING=false -DWITH_EIGEN=true
-  CONFIG_PYTHON:  -DDGTAL_WRAP_PYTHON=ON -DDGTAL_BUILD_TESTING_PYTHON=ON
+  CONFIG_GLOBAL:  -DDGTAL_BUILD_EXAMPLES=false -DDGTAL_BUILD_TESTS=false
+  CONFIG_PYTHON:  -DDGTAL_WRAP_PYTHON=ON -DDGTAL_BUILD_TESTS_PYTHON=ON
   CONFIG_LINUX:
   CONFIG_MAC:
-  CONFIG_WINDOWS: -DWITH_OPENMP=true -DENABLE_CONAN=true -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_CXX_COMPILER="cl.exe"
+  CONFIG_WINDOWS: -DDGTAL_WITH_OPENMP=true -DENABLE_CONAN=true -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_CXX_COMPILER="cl.exe"
 
 jobs:
   build:

.github/workflows/pythonBindings-Pypi.yml

@@ -12,7 +12,7 @@ env:
   CONFIG_GLOBAL: 
   CONFIG_LINUX:
   CONFIG_MAC:
-  CONFIG_WINDOWS: -DWITH_OPENMP=true -DENABLE_CONAN=true -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_CXX_COMPILER="cl.exe"
+  CONFIG_WINDOWS: -DDGTAL_WITH_OPENMP=true -DENABLE_CONAN=true -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_CXX_COMPILER="cl.exe"
 
 jobs:
   build:

CMakeLists.txt

@@ -22,9 +22,9 @@ list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/deps)
 
 
 
-set(DGtal_VERSION_MAJOR 1)
-set(DGtal_VERSION_MINOR 4)
-set(DGtal_VERSION_PATCH 2)
+set(DGtal_VERSION_MAJOR 2)
+set(DGtal_VERSION_MINOR 0)
+set(DGtal_VERSION_PATCH beta)
 set(DGTAL_VERSION "${DGtal_VERSION_MAJOR}.${DGtal_VERSION_MINOR}.${DGtal_VERSION_PATCH}")
 set(PROJECT_VERSION "${DGtal_VERSION_MAJOR}.${DGtal_VERSION_MINOR}.${DGtal_VERSION_PATCH}")
 set(VERSION ${DGtal_VERSION_MAJOR}.${DGtal_VERSION_MINOR}.${DGtal_VERSION_PATCH})
@@ -116,7 +116,7 @@ include(CpackCtest)
 # -----------------------------------------------------------------------------
 # Randomized build 2/2.
 # -----------------------------------------------------------------------------
-if (BUILD_EXAMPLES OR BUILD_TESTING)
+if (DGTAL_BUILD_EXAMPLES OR DGTAL_BUILD_TESTS)
  message(STATUS "Randomized examples/testing")
  if (DGTAL_RANDOMIZED_TESTING_THRESHOLD EQUAL "100")
   message(STATUS "All examples or unit-tests will be compiled (cmake variable DGTAL_RANDOMIZED_TESTING_THRESHOLD)")

ChangeLog.md

@@ -1,5 +1,7 @@
 # DGtal 2.0
 
+- *Build*
+  - Prefixing main cmake variables with `DGTAL_` (David Coeurjolly, [#1753](https://github.com/DGtal-team/DGtal/pull/1753))
 
 # DGtal 1.4.2
 
@@ -477,7 +479,7 @@
     (Jocelyn Meyron, [#1553](https://github.com/DGtal-team/DGtal/pull/1553))
   - Fix issue
     [#1566](https://github.com/DGtal-team/DGtal/issues/1566): do not
-    compile example checkLatticeBallQuickHull if WITH_GMP is not set
+    compile example checkLatticeBallQuickHull if DGTAL_WITH_GMP is not set
     (Jacques-Olivier Lachaud,[#1567](https://github.com/DGtal-team/DGtal/pull/1567))
   - Fix AppVeyor issue on PlaneProbingParallelepipedEstimator and PlaneProbingRNeighborhood
     (Bertrand Kerautret, [#1568](https://github.com/DGtal-team/DGtal/pull/1568))

Dockerfile

@@ -62,9 +62,9 @@ RUN mkdir /home/digital/git/DGtal
 
 
 #### clone git and install 
-#RUN git clone https://github.com/DGtal-team/DGtal.git /home/digital/git/DGtal
+RUN git clone https://github.com/DGtal-team/DGtal.git /home/digital/git/DGtal
 
 #RUN mkdir /home/digital/git/DGtal/build 
-#RUN cd /home/digital/git/DGtal/build &&  cmake .. -DWITH_GMP=true -DWITH_EIGEN=true -DWITH_FFTW3=true -DWITH_CGAL=true -DWITH_ITK=true -DWITH_OPENMP=true -DWITH_CAIRO=true -DWITH_QGLVIEWER=true -DWITH_MAGICK=true && make install
+RUN cd /home/digital/git/DGtal/build &&  cmake .. -DDGTAL_WITH_GMP=true -DWITH_EIGEN=true -DDGTAL_WITH_FFTW3=true - DDGTAL_WITH_CGAL=true  -DDGTAL_WITH_ITK=true -DDGTAL_WITH_OPENMP=true  -DDGTAL_WITH_CAIRO=true -DWITH_QGLVIEWER=true -DWITH_MAGICK=true && make install
 
 

cmake/BuildExamples.cmake

@@ -1,9 +1,9 @@
-option(BUILD_EXAMPLES "Build examples." OFF)
-if (BUILD_EXAMPLES)
+option(DGTAL_BUILD_EXAMPLES "Build examples." OFF)
+if (DGTAL_BUILD_EXAMPLES)
   message(STATUS "Build examples ENABLED")
   add_subdirectory (${PROJECT_SOURCE_DIR}/examples)
 else()
-  message(STATUS "Build examples DISABLED (you can activate the examples with '-DBUILD_EXAMPLES=ON' cmake option)")
+  message(STATUS "Build examples DISABLED (you can activate the examples with '-DDGTAL_BUILD_EXAMPLES=ON' cmake option)")
 endif()
 message(STATUS "-------------------------------------------------------------------------------")
 
@@ -12,11 +12,11 @@ message(STATUS "----------------------------------------------------------------
 # -----------------------------------------------------------------------------
 # polyscope examples
 # -----------------------------------------------------------------------------
-option(BUILD_POLYSCOPE_EXAMPLES "Build polyscope examples." OFF)
-if (BUILD_POLYSCOPE_EXAMPLES )
-  message(STATUS "Build polyscope examples ENABLED (BUILD_POLYSCOPE_EXAMPLES)")
+option(DGTAL_BUILD_POLYSCOPE_EXAMPLES "Build polyscope examples." OFF)
+if (DGTAL_BUILD_POLYSCOPE_EXAMPLES )
+  message(STATUS "Build polyscope examples ENABLED (DGTAL_BUILD_POLYSCOPE_EXAMPLES)")
   add_subdirectory (${PROJECT_SOURCE_DIR}/examples/polyscope-examples)
 else()
-  message(STATUS "Build polyscope examples DISABLED (BUILD_POLYSCOPE_EXAMPLES)")
+  message(STATUS "Build polyscope examples DISABLED (DGTAL_BUILD_POLYSCOPE_EXAMPLES)")
 endif()
 

cmake/CheckDGtalDependencies.cmake

@@ -36,7 +36,4 @@ endif()
 # -----------------------------------------------------------------------------
 # Eigen (already fetched)
 # -----------------------------------------------------------------------------
-set(WITH_EIGEN ON)
-set(EIGEN_FOUND_DGTAL 1)
-target_compile_definitions(DGtal PUBLIC "-DWITH_EIGEN=true")
 set(DGtalLibDependencies ${DGtalLibDependencies} Eigen3::Eigen)