Merge branch 'master' into alphaDisplayMesh

.github/PULL_REQUEST_TEMPLATE.md

@@ -11,5 +11,5 @@
 - [ ] Check if it follows the tools structure described in [CONTRIBUTING.md](https://github.com/DGtal-team/DGtalTools/blob/master/CONTRIBUTING.md)
 - [ ] New entry in the [ChangeLog.md](https://github.com/DGtal-team/DGtalTools/blob/master/ChangeLog.md) added.
 - [ ] Update the readme with potentially a screenshot of the tools if it applies. 
-- [ ] No warning raised in Debug ```cmake``` mode (otherwise, Travis C.I. will fail).
-- [ ] All continuous integration tests pass (Github Actions & appveyor).
+- [ ] No warning raised in Debug ```cmake``` mode (otherwise, Github Actions C.I. will fail).
+- [ ] All continuous integration tests pass (Github Actions).

.github/workflows/buildAndDocumentation.yml

@@ -1,4 +1,4 @@
-name: CI (linux/macOS)
+name: CI (linux/macOS/windows)
 
 on:
   push:
@@ -12,6 +12,7 @@ env:
   CONFIG_GLOBAL: 
   CONFIG_LINUX:  -DWITH_MAGICK=true -DWITH_GMP=true -DWITH_FFTW3=true -DWARNING_AS_ERROR=ON -DWITH_HDF5=true -DWITH_QGLVIEWER=true -DWITH_CAIRO=true  -DWITH_EIGEN=true -DDGTAL_ENABLE_FLOATING_POINT_EXCEPTIONS=true
   CONFIG_MAC:    -DWITH_EIGEN=true -DWITH_GMP=tue
+  CONFIG_WINDOWS: -DWITH_OPENMP=true -DENABLE_CONAN=true #-DWITH_FFTW3=true  #-DWITH_CAIRO=true #-DWITH_ITK=true  -DWITH_GMP=true
 
 
 jobs:
@@ -20,7 +21,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        os: [ubuntu-latest, macOS-latest]
+        os: [ubuntu-latest, macOS-latest,windows-latest]
 
     steps:
 
@@ -44,9 +45,28 @@ jobs:
        if: matrix.os == 'macOS-latest'
        run: brew install boost ninja eigen gmp
 
+     - name: Install conan
+       if: matrix.os == 'windows-latest'
+       id: conan
+       uses: turtlebrowser/get-conan@main
+       with:
+         version: 1.57.0
+
+     - name: Create conan default profile
+       if: matrix.os == 'windows-latest'
+       run: conan profile new default --detect
+
+     - uses: actions/cache@v3
+       if: matrix.os == 'windows-latest'
+       with:
+         path: ~/.conan
+         key: ${{ runner.os }}-conan-Release
+
+
      - name: Create Build Environment
        run: cmake -E make_directory ${{runner.workspace}}/build
 
+
 
      - name: DGtalBuild (linux)
        if: matrix.os == 'ubuntu-latest'
@@ -73,7 +93,18 @@ jobs:
            echo  cmake .. $CONFIG_MAC -DBUILD_EXAMPLES=false -DBUILD_TESTING=false  -G Ninja
            cmake .. $CONFIG_MAC -DBUILD_EXAMPLES=false -DBUILD_TESTING=false  -G Ninja
            ninja
-
+     - name: DGtalBuild (windows)
+       if: matrix.os == 'windows-latest'
+       shell: bash
+       working-directory: ${{runner.workspace}}/build
+       run: |
+           git clone --depth 1 https://github.com/DGtal-team/DGtal.git
+           cd DGtal
+           mkdir buildDGtal
+           cd buildDGtal
+           echo  cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE $CONFIG_WINDOWS -DBUILD_EXAMPLES=false -DBUILD_TESTING=false 
+           cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE $CONFIG_WINDOWS -DBUILD_EXAMPLES=false -DBUILD_TESTING=false  
+           cmake --build . --config Release --parallel 3
      - name: Configure CMake (linux)
        if: matrix.os == 'ubuntu-latest'
        shell: bash
@@ -85,7 +116,13 @@ jobs:
        shell: bash
        working-directory: ${{runner.workspace}}/build
        run: cmake $GITHUB_WORKSPACE  -DDGtal_DIR=${{runner.workspace}}/build/DGtal/buildDGtal -DCMAKE_BUILD_TYPE=$BUILD_TYPE $CONFIG_GLOBAL -DDGTALTOOLS_RANDOMIZED_BUILD_THRESHOLD=25  -DDGTALTOOLS_RANDOMIZED_BUILD_WHITELIST="${{ steps.whitelisttools.outputs.WHITE_LIST_TOOLS }}" $CONFIG_MAC -G Ninja
-
+
+     - name: Configure CMake (windows)
+       if: matrix.os == 'windows-latest'
+       shell: bash
+       working-directory: "${{runner.workspace}}/build"
+       run: cmake $GITHUB_WORKSPACE -DCMAKE_MODULE_PATH="D:/a/DGtalTools/build/DGtal/buildDGtal" -DDGtal_DIR="D:/a/DGtalTools/build/DGtal/buildDGtal"  -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DDGTAL_RANDOMIZED_TESTING_WHITELIST="${{ steps.whitelist.outputs.WHITELIST }}"
+
      - name: Build
        working-directory: ${{runner.workspace}}/build
        shell: bash

CMakeLists.txt

@@ -10,6 +10,9 @@ cmake_policy(SET CMP0057 NEW) # the new interpretation of IN_LIST is by default
 SET(CMAKE_MODULE_PATH ${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)
+
+
 
 # -----------------------------------------------------------------------------
 # DGtal dependencies
@@ -25,10 +28,22 @@ message(STATUS "DGtal found.")
 
 
  # -----------------------------------------------------------------------------
- # CPP11
+ # CPP17
  # -----------------------------------------------------------------------------
- set (CMAKE_CXX_STANDARD 11)
- set (CMAKE_CXX_STANDARD_REQUIRED TRUE)
+set(DGTALTOOLS_CMAKE_CXX_STANDARD_MIN_REQUIRED 17)
+ if(NOT CMAKE_CXX_STANDARD)
+   set(CMAKE_CXX_STANDARD ${DGTALTOOLS_CMAKE_CXX_STANDARD_MIN_REQUIRED})
+ else()
+  # Throw if CMAKE_CXX_STANDARD is 98
+  if(${CMAKE_CXX_STANDARD} EQUAL 98)
+    message(FATAL_ERROR "CMAKE_CXX_STANDARD is set to ${CMAKE_CXX_STANDARD}, "
+      "but DGtalTools requires at least ${DGTALTOOLS_CMAKE_CXX_STANDARD_MIN_REQUIRED}.")
+  endif()
+endif()
+if(NOT CMAKE_CXX_STANDARD_REQUIRED)
+  set(CMAKE_CXX_STANDARD_REQUIRED ON)
+endif()
+
 
 
 
@@ -52,8 +67,6 @@ endif (CMAKE_CXX_FLAGS MATCHES "-ftemplate-depth-[0-9]*")
 # -----------------------------------------------------------------------------
 include_directories( "${PROJECT_SOURCE_DIR}/ext/" )
 
-
-
 # -----------------------------------------------------------------------------
 # Define variables and cmake parameters, and display some information
 # -----------------------------------------------------------------------------

ChangeLog.md

@@ -25,14 +25,15 @@
 
 
 
-
 # DGtalTools 1.3
 
 - *build*
   - New cmake option (DGTAL_RANDOMIZED_BUILD_THRESHOLD) to set the
     (approximated) % of tools build
-    (Bertrand Kerautret [#416](https://github.com/DGtal-team/DGtal/pull/416))
-
+    (Bertrand Kerautret [#416](https://github.com/DGtal-team/DGtalTools/pull/416))
+  - Following DGtal C++17 is now required. (David Coeurjolly and Bertrand Kerautret, 
+     [#449](https://github.com/DGtal-team/DGtal/pull/449))
+
 - *converters*
   - heightfield2shading: new option to add a matcap rendering (from normal
     direction interpreted as HSV vector)

README.md

@@ -37,8 +37,8 @@ More Information
 * Release 0.9.1 [![DOI](https://zenodo.org/badge/doi/10.5281/zenodo.45130.svg)](http://dx.doi.org/10.5281/zenodo.45130)
 * Release 0.9 [![DOI](https://zenodo.org/badge/doi/10.5281/zenodo.31882.svg)](http://dx.doi.org/10.5281/zenodo.31882)
 * Release 0.8 [![DOI](https://zenodo.org/badge/doi/10.5281/zenodo.11587.svg)](http://dx.doi.org/10.5281/zenodo.11587)
-* Continuous Integration (Linux/MacOS) ![Build status](https://github.com/DGtal-team/DGtalTools/actions/workflows/buildAndDocumentation.yml/badge.svg)
-* Windows [![Build status](https://ci.appveyor.com/api/projects/status/o156pe96bd02sdr5/branch/master?svg=true)](https://ci.appveyor.com/project/kerautret/dgtaltools-7x999/branch/master)
+* Continuous Integration (Linux/MacOS/Windows) ![Build status](https://github.com/DGtal-team/DGtalTools/actions/workflows/buildAndDocumentation.yml/badge.svg)
+
 
 Documentation
 ==============