Merging dgtal variable names (tbc)

.github/workflows/build-master.yml

@@ -2,7 +2,7 @@ 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.)

cmake/CheckDGtalOptionalDependencies.cmake

@@ -13,16 +13,12 @@ message(STATUS "   cmake frontend, or define cmake commandline variables")
 message(STATUS "   -e.g. '-DWITH_GMP:string=true'-, cf documentation)")
 message(STATUS "")
 
-option(WITH_OPENMP "With OpenMP (compiler multithread programming) features." OFF)
-option(WITH_GMP "With Gnu Multiprecision Library (GMP)." OFF)
-option(WITH_CGAL "With CGAL." OFF)
-option(WITH_ITK "With Insight Toolkit ITK." OFF)
-option(WITH_CAIRO "With CairoGraphics." OFF)
-option(WITH_HDF5 "With HDF5." OFF)
-option(WITH_QGLVIEWER "With LibQGLViewer for 3D visualization (Qt5 required)." OFF)
-option(WITH_PATATE "With Patate library for geometry processing." OFF)
-option(WITH_FFTW3 "With FFTW3 discrete Fourier Transform library." OFF)
-option(WITH_LIBIGL "With libIGL (with copyleft/CGAL included)." OFF)
+option(DGTAL_WITH_OPENMP "With OpenMP (compiler multithread programming) features." OFF)
+option(DGTAL_WITH_GMP "With Gnu Multiprecision Library (GMP)." OFF)
+option(DGTAL_WITH_CGAL "With CGAL." OFF)
+option(DGTAL_WITH_ITK "With Insight Toolkit ITK." OFF)
+option(DGTAL_WITH_CAIRO "With CairoGraphics." OFF)
+option(DGTAL_WITH_HDF5 "With HDF5." OFF)
 
 #----------------------------------
 # Removing -frounding-math compile flag for clang
@@ -50,9 +46,9 @@ endif()
 
 if(WITH_CGAL)
   set(LIST_OPTION ${LIST_OPTION} [CGAL]\ )
-  message(STATUS "      WITH_CGAL          true    (cgal)")
+  message(STATUS "      DGTAL_WITH_CGAL          true    (cgal)")
 else()
-  message(STATUS "      WITH_CGAL          false   (cgal)")
+  message(STATUS "      DGTAL_WITH_CGAL          false   (cgal)")
 endif()
 
 if(WITH_PATATE)
@@ -64,9 +60,7 @@ endif()
 
 if(WITH_ITK)
   set(LIST_OPTION ${LIST_OPTION} [ITK]\ )
-  message(STATUS "      WITH_ITK           true    (Insight Toolkit ITK image wrapper)")
-else()
-  message(STATUS "      WITH_ITK           false   (Insight Toolkit ITK image wrapper)")
+  message(STATUS "      DGTAL_WITH_ITK           false   (Insight Toolkit ITK image wrapper)")
 endif()
 
 if(WITH_CAIRO)
@@ -78,9 +72,8 @@ endif()
 
 if(WITH_HDF5)
   set(LIST_OPTION ${LIST_OPTION} [HDF5]\ )
-  message(STATUS "      WITH_HDF5          true    (HDF5 image i/o)")
 else()
-  message(STATUS "      WITH_HDF5          false   (HDF5 image i/o)")
+  message(STATUS "      DGTAL_WITH_HDF5          false   (HDF5 image i/o)")
 endif()
 
 
@@ -215,7 +208,7 @@ set(HDF5_FOUND_DGTAL 0)
 if(WITH_HDF5)
   find_package (HDF5 REQUIRED HL C)
   if(HDF5_FOUND)
-    target_compile_definitions(DGtal PUBLIC -DWITH_HDF5)
+    target_compile_definitions(DGtal PUBLIC -DDGTAL_WITH_HDF5)
     target_include_directories(DGtal PUBLIC ${HDF5_INCLUDE_DIRS})
     target_link_libraries(DGtal PUBLIC ${HDF5_LIBRARIES} ${HDF5_HL_LIBRARIES})
     set(DGtalLibDependencies ${DGtalLibDependencies} ${HDF5_LIBRARIES} ${HDF5_HL_LIBRARIES})