use new prefix of DGTAL 2.0 cmake option

Author: kerautret

CMakeLists.txt

@@ -102,9 +102,9 @@ message(STATUS "----------------------------------------------------------------
 #-----------------------------------------------------------------------------
 # ITK setting
 #-----------------------------------------------------------------------------
-if (  WITH_ITK )
+if (  DGTAL_WITH_ITK )
     include(${ITK_USE_FILE})
-ENDIF( WITH_ITK )
+ENDIF( DGTAL_WITH_ITK )
 
 
 

converters/CMakeLists.txt

@@ -23,22 +23,22 @@ SET(DGTAL_TOOLS_SRC
   vol2vox
   mesh2vol)
 
-if( WITH_HDF5 )
+if( DGTAL_WITH_HDF5 )
 SET(DGTAL_TOOLS_SRC ${DGTAL_TOOLS_SRC}
     raw2HDF5
     HDF52vol)
-endif( WITH_HDF5 )
+endif( DGTAL_WITH_HDF5 )
 
 FOREACH(FILE ${DGTAL_TOOLS_SRC})
   DGtalTools_add_tool(${FILE})
 ENDFOREACH(FILE)
 
 
-if (  WITH_ITK )
+if (  DGTAL_WITH_ITK )
   SET(DGTAL_TOOLS_ITK
     dicom2vol
     itk2vol)
   FOREACH(FILE ${DGTAL_TOOLS_ITK})
     DGtalTools_add_tool(${FILE})
   ENDFOREACH(FILE)
-ENDIF( WITH_ITK )
+ENDIF( DGTAL_WITH_ITK )

estimators/CMakeLists.txt

@@ -11,27 +11,27 @@ SET(DGTAL_TOOLS_SRC
   eulerCharacteristic
 )
 
-if (WITH_EIGEN)
+if (DGTAL_WITH_EIGEN)
     DGtalTools_add_tool(volSurfaceRegularization volSurfaceRegularization-details/surface_approx.cpp)
 endif()
 
-if ( WITH_VISU3D_QGLVIEWER )
+if ( DGTAL_WITH_VISU3D_QGLVIEWER )
   SET(VISU3D_TESTS_SRC
       3dCurveTangentEstimator
   )
   FOREACH(FILE ${VISU3D_TESTS_SRC})
      DGtalTools_add_tool(${FILE})
   ENDFOREACH(FILE)
-endif ( WITH_VISU3D_QGLVIEWER )
+endif ( DGTAL_WITH_VISU3D_QGLVIEWER )
 
-if (  WITH_CGAL )
+if (  DGTAL_WITH_CGAL )
   SET(CGAL_TESTS_SRC
     3dLocalEstimators
      )
   FOREACH(FILE ${CGAL_TESTS_SRC})
      DGtalTools_add_tool(${FILE})
   ENDFOREACH(FILE)
-endif ( WITH_CGAL )
+endif ( DGTAL_WITH_CGAL )
 
 FOREACH(FILE ${DGTAL_TOOLS_SRC})
   DGtalTools_add_tool(${FILE})

imageProcessing/CMakeLists.txt

@@ -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)

visualisation/CMakeLists.txt

@@ -10,7 +10,7 @@ foreach (FILE ${DGTAL_TOOLS_SRC})
   DGtalTools_add_tool(${FILE})
 ENDFOREACH(FILE)
 
-if (  WITH_VISU3D_QGLVIEWER )
+if (  DGTAL_WITH_VISU3D_QGLVIEWER )
     set_property(SOURCE ui_sliceViewer.h PROPERTY SKIP_AUTOMOC ON)
     SET(DGTAL_EXAMPLES_QGL_SRC
     3dVolViewer
@@ -32,20 +32,20 @@ if (  WITH_VISU3D_QGLVIEWER )
 
   include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-  if (WITH_QT4)
+  if (DGTAL_WITH_QT4)
     QT4_WRAP_UI(ui_sliceViewer_FORMS_HEADERS sliceViewer.ui)
     QT4_WRAP_CPP(sliceViewer_HEADERS_MOC sliceViewer.h OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
       DGtalTools_add_tool(sliceViewer ${sliceViewer_HEADERS_MOC} ${ui_sliceViewer_FORMS_HEADERS})      
-  elseif (WITH_QT5)
+  elseif (DGTAL_WITH_QT5)
     set(CMAKE_AUTOMOC ON)
     set(CMAKE_INCLUDE_CURRENT_DIR ON)
     qt5_wrap_ui(ui_sliceViewer_FORMS_HEADERS sliceViewer.ui)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5OpenGL_EXECUTABLE_COMPILE_FLAGS}")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Xml_EXECUTABLE_COMPILE_FLAGS}")
     DGtalTools_add_tool(sliceViewer ${ui_sliceViewer_FORMS_HEADERS})
-  endif (WITH_QT4)
-endif (WITH_VISU3D_QGLVIEWER)
+  endif (DGTAL_WITH_QT4)
+endif (DGTAL_WITH_VISU3D_QGLVIEWER)
 
 
 

volumetric/CMakeLists.txt

@@ -25,10 +25,10 @@ FOREACH(FILE ${DGTAL_TOOLS_SRC})
 ENDFOREACH(FILE)
 
 
-if (  WITH_VISU3D_QGLVIEWER )
+if (  DGTAL_WITH_VISU3D_QGLVIEWER )
   SET(DGTAL_EXAMPLES_QGL_SRC
     homotopicThinning3D )
   FOREACH(FILE ${DGTAL_EXAMPLES_QGL_SRC})
     DGtalTools_add_tool(${FILE})
   ENDFOREACH(FILE)
-endif ( WITH_VISU3D_QGLVIEWER )
+endif ( DGTAL_WITH_VISU3D_QGLVIEWER )