CMake V2 + Cpp20 + (Almost) Header only

.github/workflows/build-PR2.0.yml

@@ -0,0 +1,149 @@
+name: CI (linux/macOS/windows), PR (2.0)
+
+on:
+  push:
+    branches: [ main2.0 ]
+  pull_request:
+    branches: [ main2.0 ]
+
+env:
+  TESTBLACKLIST: "(testLinearStructure|testIntegerConverter|testArithmeticalDSSComputerOnSurfels)"
+  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_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:     -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:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macOS-latest, windows-latest]
+        BUILD_TYPE: [Release]
+        python-version: ["3.9"]
+
+    steps:
+     - uses: actions/checkout@v3
+       with:
+          fetch-depth: 5
+
+     - name: Set up Python ${{ matrix.python-version }}
+       uses: actions/setup-python@v4
+       with: 
+          python-version: ${{ matrix.python-version }}
+
+     - name: Install linux deps
+       if: matrix.os == 'ubuntu-latest'
+       run: |
+           sudo apt-get update
+           sudo apt-get install ccache zsh libqglviewer-dev-qt5 libcgal-dev libboost-dev ninja-build libhdf5-serial-dev libboost-dev libcairo2-dev libgmp-dev libfftw3-dev libinsighttoolkit5-dev xorg-dev libglu1-mesa-dev freeglut3-dev mesa-common-dev
+
+     - name: Install macOS deps
+       if: matrix.os == 'macOS-latest'
+       run: brew install boost ninja gmp libomp ccache cgal
+
+     - name: Install conan
+       if: matrix.os == 'windows-latest'
+       id: conan
+       uses: turtlebrowser/get-conan@main
+       with:
+         version: 2.4.0
+
+     - name: Create conan default profile
+       if: matrix.os == 'windows-latest'
+       run: |
+         conan profile detect --force
+
+
+     - uses: actions/cache@v4
+       if: matrix.os == 'windows-latest'
+       with:
+         path: ~/.conan2
+         key: ${{ runner.os }}-conan2-${{ matrix.BUILD_TYPE }}
+
+     - name: Get white list of tests
+       run: |
+           echo "::set-output name=WHITELIST::$(${{runner.workspace}}/DGtal/.github/workflows/create_whitelist.sh)"
+       id: whitelist
+
+     - name: Create Build Environment
+       run: cmake -E make_directory ${{runner.workspace}}/build
+
+     - name: Configure CMake (linux)
+       if: matrix.os == 'ubuntu-latest'
+       shell: bash
+       working-directory: ${{runner.workspace}}/build
+       run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{ matrix.BUILD_TYPE }} $CONFIG_GLOBAL $CONFIG_LINUX -DDGTAL_RANDOMIZED_TESTING_WHITELIST="${{ steps.whitelist.outputs.WHITELIST }}" -G Ninja
+
+     - name: Configure CMake (macOS)
+       if: matrix.os == 'macOS-latest'
+       shell: bash
+       working-directory: ${{runner.workspace}}/build
+       run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{ matrix.BUILD_TYPE }}  $CONFIG_GLOBAL $CONFIG_MAC -DDGTAL_RANDOMIZED_TESTING_WHITELIST="${{ steps.whitelist.outputs.WHITELIST }}" 
+
+
+     - name: Configure CMake (windows)
+       if: matrix.os == 'windows-latest'
+       shell: bash
+       working-directory: ${{runner.workspace}}/build
+       run: |
+          conan install $GITHUB_WORKSPACE --build=missing -s:a compiler.cppstd=20
+          cmake $GITHUB_WORKSPACE -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_BUILD_TYPE=${{ matrix.BUILD_TYPE }} $CONFIG_GLOBAL $CONFIG_WINDOWS -DDGTAL_RANDOMIZED_TESTING_WHITELIST="${{ steps.whitelist.outputs.WHITELIST }}"
+
+     - name: Build
+       working-directory: ${{runner.workspace}}/build
+       shell: bash
+       # Execute the build.  You can specify a specific target with "--target <NAME>"
+       run: cmake --build . --config ${{ matrix.BUILD_TYPE }} --parallel 3
+
+     - name: Test
+       working-directory: ${{runner.workspace}}/build
+       if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest'
+       shell: bash
+       run: |
+           echo ctest -C ${{ matrix.BUILD_TYPE }}  --output-on-failure -E $TESTBLACKLIST
+           ctest -C $${{ matrix.BUILD_TYPE }}  --output-on-failure -E $TESTBLACKLIST
+
+     - name: DGtalTools (linux only, we check this PR against DGtalTools PR main2.0)
+       if: matrix.os == 'ubuntu-latest'
+       shell: bash
+       working-directory: ${{runner.workspace}}/build
+       run: |
+           git clone --depth 1 https://github.com/DGtal-team/DGtalTools.git
+           cd DGtalTools
+           git fetch origin pull/467/head:main2.0
+           git checkout main2.0
+           mkdir buildDGtalTools
+           cd buildDGtalTools
+           cmake .. -DCMAKE_MODULE_PATH=${{runner.workspace}}/DGtal/cmake/deps -DDGtal_DIR=${{runner.workspace}}/build  -DDGTALTOOLS_RANDOMIZED_BUILD_THRESHOLD=25 -G Ninja
+           ninja
+
+
+  # Documentatin (build, check and deploy)
+  Documentation:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Set up
+      run: |
+         sudo apt-get update
+         sudo apt-get install libboost-dev graphviz texlive doxygen
+
+    - name: Building pages
+      run: |
+         mkdir build
+         cd build
+         cmake ..
+         wget --no-check-certificate -O "${{runner.workspace}}/DGtal/build/DGtalTools-tagfile" http://dgtal.org/doc/tags/DGtalTools-tagfile;
+         make doc > buildDoc.log
+
+    - name: Checking doc
+      run: |
+          pwd
+          export BUILD_DIR=${{runner.workspace}}/DGtal/build
+          export SRC_DIR=${{runner.workspace}}/DGtal/
+          .github/workflows/checkDoxygenDocumentation.sh
+      #&& .github/workflows/check_src_file_tag.sh

.github/workflows/build-master.yml

@@ -2,7 +2,7 @@ name: CI (linux/macOS/windows), master
 
 on:
   push:
-    branches: [ master, main2.0 ]
+    branches: [ master ]
 
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
@@ -82,7 +82,7 @@ jobs:
        shell: bash
        working-directory: ${{runner.workspace}}/build
        run: |
-            conan install $GITHUB_WORKSPACE --build=missing
+            conan install $GITHUB_WORKSPACE --build=missing -s:a compiler.cppstd=20
             cmake $GITHUB_WORKSPACE -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_BUILD_TYPE=${{ matrix.BUILD_TYPE }} $CONFIG_GLOBAL $CONFIG_WINDOWS -DDGTAL_RANDOMIZED_TESTING_WHITELIST="${{ steps.whitelist.outputs.WHITELIST }}"
 
      - name: Build

.github/workflows/buildAndDocumentation-PR.yml

@@ -2,12 +2,12 @@ name: CI (linux/macOS/windows), PR
 
 on:
   pull_request:
-    branches: [ master, main2.0 ]
+    branches: [ master ]
 
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
   TESTBLACKLIST: "(testLinearStructure|testIntegerConverter|testArithmeticalDSSComputerOnSurfels)"
-  CONFIG_GLOBAL:  -DDGTAL_BUILD_EXAMPLES=true -DDGTAL_BUILD_TESTS=true -DDGTAL_RANDOMIZED_TESTING_THRESHOLD=10 
+  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 
@@ -83,7 +83,7 @@ jobs:
        shell: bash
        working-directory: ${{runner.workspace}}/build
        run: |
-          conan install $GITHUB_WORKSPACE --build=missing
+          conan install $GITHUB_WORKSPACE --build=missing -s:a compiler.cppstd=20
           cmake $GITHUB_WORKSPACE -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_BUILD_TYPE=${{ matrix.BUILD_TYPE }} $CONFIG_GLOBAL $CONFIG_WINDOWS -DDGTAL_RANDOMIZED_TESTING_WHITELIST="${{ steps.whitelist.outputs.WHITELIST }}"
 
      - name: Build
@@ -118,8 +118,9 @@ jobs:
            cd DGtalTools
            mkdir buildDGtalTools
            cd buildDGtalTools
-           echo  cmake .. -DDGTAL_DIR=${{runner.workspace}}/build  -DDGTALTOOLS_RANDOMIZED_BUILD_THRESHOLD=25 -G Ninja
-           cmake .. -DDGtal_DIR=${{runner.workspace}}/build  -DDGTALTOOLS_RANDOMIZED_BUILD_THRESHOLD=25 -G Ninja
+           ls 
+           echo  cmake .. -DCMAKE_PREFIX_PATH=${{runner.workspace}}/DGtal/cmake/deps -DDGTAL_DIR=${{runner.workspace}}/build  -DDGTALTOOLS_RANDOMIZED_BUILD_THRESHOLD=25 -G Ninja
+           cmake .. -DCMAKE_PREFIX_PATH=${{runner.workspace}}/DGtal/cmake/deps -DDGtal_DIR=${{runner.workspace}}/build  -DDGTALTOOLS_RANDOMIZED_BUILD_THRESHOLD=25 -G Ninja
            ninja
 
   # Documentatin (build, check and deploy)

.github/workflows/pythonBindings-PR.yml

@@ -37,7 +37,7 @@ jobs:
         if: matrix.os == 'ubuntu-latest'
         run: |
           sudo apt-get update
-          sudo apt-get install zsh libqglviewer-dev-qt5 libboost-dev libcgal-dev ninja-build libhdf5-serial-dev libboost-dev libcairo2-dev libgmp-dev libfftw3-dev  libinsighttoolkit5-dev xorg-dev libglu1-mesa-dev freeglut3-dev mesa-common-dev
+          sudo apt-get install zsh libqglviewer-dev-qt5 libboost-dev libcgal-dev ninja-build libhdf5-serial-dev libboost-dev libcairo2-dev libgmp-dev libfftw3-dev libinsighttoolkit5-dev xorg-dev libglu1-mesa-dev freeglut3-dev mesa-common-dev
 
       - name: Installing dependencies (macOS)
         if: matrix.os == 'macOS-latest'
@@ -82,7 +82,7 @@ jobs:
         shell: bash
         working-directory: ${{runner.workspace}}/build
         run: |
-            conan install $GITHUB_WORKSPACE --build=missing
+            conan install $GITHUB_WORKSPACE --build=missing -s:a compiler.cppstd=20
             cmake $GITHUB_WORKSPACE -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_BUILD_TYPE=${{ matrix.BUILD_TYPE }} $CONFIG_PYTHON $CONFIG_GLOBAL $CONFIG_WINDOWS
 
 

.github/workflows/pythonBindings-Pypi.yml

@@ -96,7 +96,7 @@ jobs:
         shell: bash
         working-directory: ${{runner.workspace}}/build
         run: |
-              conan install $GITHUB_WORKSPACE --build=missing
+              conan install $GITHUB_WORKSPACE --build=missing -s:a compiler.cppstd=20 
               cmake $GITHUB_WORKSPACE -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_BUILD_TYPE=${{ matrix.BUILD_TYPE }} $CONFIG_PYTHON $CONFIG_GLOBAL $CONFIG_WINDOWS
 
       - name: Setting build informations (Windows)

CMakeLists.txt

@@ -1,9 +1,8 @@
 # -----------------------------------------------------------------------------
 # Project definition
 # -----------------------------------------------------------------------------
-cmake_minimum_required (VERSION 3.11)
-cmake_policy(SET CMP0057 NEW) # the new interpretation of IN_LIST is by default not set (at least until  3.21.1).
-project (DGtal)
+cmake_minimum_required (VERSION 3.20)
+project (DGtal VERSION 2.0.0)
 
 # -----------------------------------------------------------------------------
 # By default, do not warn when built on machines using only VS Express:
@@ -12,27 +11,30 @@ if(NOT DEFINED CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS)
     set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS ON)
 endif()
 
-# -----------------------------------------------------------------------------
-# Define variables and cmake parameters, and display some information
-# -----------------------------------------------------------------------------
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_BINARY_DIR})
 list(APPEND CMAKE_PREFIX_PATH ${CMAKE_BINARY_DIR})
 list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
 list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/deps)
 
+# @TODO : See if those variable are still usefull,
+#         Note that they are set in source code !
+set(DGtal_VERSION_MAJOR ${CMAKE_PROJECT_VERSION_MAJOR})
+set(DGtal_VERSION_MINOR ${CMAKE_PROJECT_VERSION_MINOR})
+set(DGtal_VERSION_PATCH ${CMAKE_PROJECT_VERSION_PATCH})
+set(DGTAL_VERSION ${CMAKE_PROJECT_VERSION})
+set(PROJECT_VERSION ${CMAKE_PROJECT_VERSION})
+set(VERSION ${CMAKE_PROJECT_VERSION})
 
-
-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})
 # -----------------------------------------------------------------------------
 # Common build options/settings
 # -----------------------------------------------------------------------------
 include(Common)
 
+#------------------------------------------------------------------------------
+# Add DGtal library
+#------------------------------------------------------------------------------
+add_subdirectory(src)
+
 # -----------------------------------------------------------------------------
 # Development and debug options
 # -----------------------------------------------------------------------------
@@ -45,58 +47,12 @@ message(STATUS "Downloading external projects")
 include(FetchExternalDeps)
 message(STATUS "Done.")
 
-#------------------------------------------------------------------------------
-# Add DGtal library
-#------------------------------------------------------------------------------
-# Include CPP files to add to the library target
-#
-# each subdir can contain a ModuleSRC.txt file
-# with a set command on the variable ${DGTAL_SRC}
-#
-include(src/DGtal/base/ModuleSRC.cmake)
-include(src/DGtal/io/ModuleSRC.cmake)
-include(src/DGtal/helpers/ModuleSRC.cmake)
-## Board dependency
-include(src/Board/ModuleSRC.cmake)
-## Boost Add-ons
-include(src/BoostAddons/ModuleSRC.cmake)
-
-list(TRANSFORM DGTAL_SRC PREPEND "src/")
-list(TRANSFORM BOARD_SRC PREPEND "src/")
-list(TRANSFORM DGTALIO_SRC PREPEND "src/")
-
-# DGtal Target. Library is added on the top directory to use target_link_libraries for CMake < 3.13
-add_library (DGtal ${DGTAL_SRC} ${DGTALIO_SRC} ${BOARD_SRC} )
-target_include_directories(DGtal PUBLIC
-  $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>
-  $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/src>
-  # INSTALL_INTERFACE must not contain absolute paths
-  $<INSTALL_INTERFACE:${INSTALL_INCLUDE_DIR_RELATIVE}>
-  )
-
 # -----------------------------------------------------------------------------
 # Check mandatory and optional dependencies
 # -----------------------------------------------------------------------------
 include(CheckDGtalDependencies)
 include(CheckDGtalOptionalDependencies)
 
-# -----------------------------------------------------------------------------
-# Install
-# -----------------------------------------------------------------------------
-install(TARGETS DGtal
-  # IMPORTANT: Add the DGtal library to the "export-set"
-  EXPORT DGtalLibraryDepends
-  RUNTIME DESTINATION "${INSTALL_BIN_DIR}" COMPONENT bin
-  LIBRARY DESTINATION "${INSTALL_LIB_DIR}" COMPONENT shlib
-  ARCHIVE DESTINATION "${INSTALL_LIB_DIR}"
- #PUBLIC_HEADER DESTINATION "${INSTALL_INCLUDE_DIR}/DGtal"
-  COMPONENT dev)
-
-# -----------------------------------------------------------------------------
-# Common build options/settings
-# -----------------------------------------------------------------------------
-include(OSDependentSettings)
-
 # -----------------------------------------------------------------------------
 # Randomized build 1/2.
 # -----------------------------------------------------------------------------
@@ -138,11 +94,6 @@ include(GeneratorSpecific)
 # -----------------------------------------------------------------------------
 include(OSDependentSettings)
 
-# -----------------------------------------------------------------------------
-# Install settings
-# -----------------------------------------------------------------------------
-include(Install)
-
 #------------------------------------------------------------------------------
 # Python wrappings
 #------------------------------------------------------------------------------
@@ -152,3 +103,8 @@ include(PythonWrappings)
 # Unzip and install topology Look up Tables.
 # -----------------------------------------------------------------------------
 include(NeighborhoodTablesConfig)
+
+# -----------------------------------------------------------------------------
+# Unzip and install topology Look up Tables.
+# -----------------------------------------------------------------------------
+include(Install)

ChangeLog.md

@@ -1,5 +1,16 @@
 # DGtal 2.0
 
+- *General*
+  - Upgrade of ITK to version 5 and above (Bastien Doignies, [#1757](https://github.com/DGtal-team/DGtal/pull/1757))
+  - C++20 support and new minimal standard (Bastien Doignies, [#1757](https://github.com/DGtal-team/DGtal/pull/1757))
+  - Library is now (almost) header only (Bastien Doignies, [#1757](https://github.com/DGtal-team/DGtal/pull/1757))
+  - Fix compilation warnings (Bastien Doignies, [#1757](https://github.com/DGtal-team/DGtal/pull/1757))
+
+- *CMake*
+  - Updated to version 3.20 minimum (contemporary version of C++20's new minimal standard) (Bastien Doignies, [#1757](https://github.com/DGtal-team/DGtal/pull/1757))
+  - Updated export and install commands to more modern cmake (Bastien Doignies, [#1757](https://github.com/DGtal-team/DGtal/pull/1757))
+  - Dependancies of DGTal are now build as separate targets (Bastien Doignies, [#1757](https://github.com/DGtal-team/DGtal/pull/1757))
+
 - *Build*
   - Prefixing main cmake variables with `DGTAL_` (David Coeurjolly, [#1753](https://github.com/DGtal-team/DGtal/pull/1753))
   - Add a cmake option to use the ITK EIGEN configuration to solve the issue [#347](https://github.com/DGtal-team/DGtalTools/issues/437) of DGTalTools. (Bertrand Kerautret, [#1759](https://github.com/DGtal-team/DGtal/pull/1759)

Dockerfile

@@ -40,7 +40,7 @@ RUN apt -y install doxygen
 
 RUN apt -y install libcgal-dev
 
-#RUN apt-get -y install libinsighttoolkit4-dev
+#RUN apt-get -y install libinsighttoolkit5-dev
 
 #RUN apt -y install libqglviewer-dev-qt5