...

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 811b889fd7bfb0fa78e75120e6768face6ad2ff5..4aa96867e0c75bb107a4b87c004ae2857ff73210 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,18 +36,12 @@ SET(prj_SHORT_VERSION "${prj_MAJOR_VERSION}")
 ## == Functions, packages and options ==
 ## =====================================
 
-FIND_PACKAGE(cpPlugins QUIET)
-IF(cpPlugins_DIR)
-  OPTION(USE_cpPlugins "Build cpPlugins-based code" ON)
-ELSE(cpPlugins_DIR)
-  OPTION(USE_cpPlugins "Build cpPlugins-based code" OFF)
-  MARK_AS_ADVANCED(FORCE cpPlugins_DIR)
-ENDIF(cpPlugins_DIR)
+INCLUDE(cmake/BaseConfig.cmake)
+OPTION(USE_cpPlugins "Build cpPlugins-based code" OFF)
 IF(USE_cpPlugins)
   FIND_PACKAGE(cpPlugins)
   MARK_AS_ADVANCED(CLEAR cpPlugins_DIR)
 ENDIF(USE_cpPlugins)
-INCLUDE(cmake/BaseConfig.cmake)
 INCLUDE(cmake/KitwareTools.cmake)
 INCLUDE(cmake/QtTools.cmake)
 INCLUDE(cmake/Functions.cmake)

diff --git a/cmake/QtTools.cmake b/cmake/QtTools.cmake
index 3ec2889898c7f4715b277a99827855d45a66cfb7..f4dd0cd8d20e1e7fef2bdbda5dd3f61e936f3170 100644 (file)
--- a/cmake/QtTools.cmake
+++ b/cmake/QtTools.cmake
@@ -2,7 +2,7 @@
 ## == Find Qt4 and check if it was well configured ==
 ## ==================================================
 
-## IF(BUILD_QT4_COMPONENTS)
+IF(BUILD_QT4_COMPONENTS)
   FIND_PACKAGE(Qt4 REQUIRED)
   INCLUDE(${QT_USE_FILE})
   SET(
@@ -20,9 +20,7 @@
     QVTKWidget
     CACHE STRING "Base Qt4-based vtkRenderWindow"
     )
-  # ADD_DEFINITIONS(-DcpPlugins_QT4 -DcpExtensions_QT4)
-## ELSE(BUILD_QT4_COMPONENTS)
-  # ADD_DEFINITIONS(-UcpPlugins_QT4 -UcpExtensions_QT4)
-## ENDIF(BUILD_QT4_COMPONENTS)
+  MARK_AS_ADVANCED(CLEAR cpPlugins_Qt4_VTKWidget)
+ENDIF(BUILD_QT4_COMPONENTS)
 
 ## eof - $RCSfile$

diff --git a/cmake/Restrictions.cmake b/cmake/Restrictions.cmake
deleted file mode 100644 (file)
index d177604..0000000
--- a/cmake/Restrictions.cmake
+++ /dev/null
@@ -1,51 +0,0 @@
-## =======================================================================
-## == Force c++11 language version                                      ==
-## == NOTE: It seems that by default on Visual Studio Compiler supports ==
-## ==       c++11, so it only need to be tested on other OS.            ==
-## =======================================================================
-
-IF(NOT MSVC)
-  INCLUDE(CheckCXXCompilerFlag)
-  CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
-  IF(COMPILER_SUPPORTS_CXX11)
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-  ELSE(COMPILER_SUPPORTS_CXX11)
-    CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
-    IF(COMPILER_SUPPORTS_CXX0X)
-      SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
-    ELSE(COMPILER_SUPPORTS_CXX0X)
-      MESSAGE(
-        FATAL_ERROR
-        "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support."
-        )
-    ENDIF(COMPILER_SUPPORTS_CXX0X)
-  ENDIF(COMPILER_SUPPORTS_CXX11)
-ENDIF(NOT MSVC)
-
-## ===================================================
-## == Prepare header generator to build shared libs ==
-## ===================================================
-
-INCLUDE(GenerateExportHeader)
-
-## ==================================================
-## == Do not allow to build inside the source tree ==
-## ==================================================
-
-IF(PROJECT_BINARY_DIR STREQUAL ${PROJECT_SOURCE_DIR})
-  MESSAGE(FATAL_ERROR "Building in the source tree is not allowed.")
-ENDIF(PROJECT_BINARY_DIR STREQUAL ${PROJECT_SOURCE_DIR})
-
-## =================================================
-## == Where to put targets (executables and libs) ==
-## =================================================
-
-SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR})
-SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR})
-MARK_AS_ADVANCED(
-  CMAKE_BACKWARDS_COMPATIBILITY
-  EXECUTABLE_OUTPUT_PATH
-  LIBRARY_OUTPUT_PATH
-  )
-
-## eof - $RCSfile$

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 8f3b1ffc4b47609521d800558f2358cf592ccc0f..5afdc751aa270705eb27d3308e1aba1e42943b4f 100644 (file)
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -3,8 +3,6 @@
 ## == Build instances for cpPlugins ==
 ## ===================================
 
-IF(USE_cpPlugins)
-  SUBDIRS(fpaInstances)
-ENDIF(USE_cpPlugins)
+SUBDIRS(fpaInstances)
 
 ## eof - $RCSfile$

diff --git a/lib/fpaInstances/CMakeLists.txt b/lib/fpaInstances/CMakeLists.txt
index dc320c77dedd5d307268c5ba9aa6cedd7c867206..e170abd0e0758b0a33c2127a1f771e29bcb9a30d 100644 (file)
--- a/lib/fpaInstances/CMakeLists.txt
+++ b/lib/fpaInstances/CMakeLists.txt
@@ -1,24 +1,26 @@
 ## ===========================
 ## == Compile each instance ==
 ## ===========================
-
-INCLUDE_DIRECTORIES(
-  ${PROJECT_SOURCE_DIR}/lib
-  ${PROJECT_BINARY_DIR}/lib
-  )
-SET(_pfx fpaInstaces)
-
-cpPlugins_BuildLibrary(${_pfx}DataObjects SHARED ${CMAKE_CURRENT_SOURCE_DIR}/DataObjects.i)
-cpPlugins_BuildLibrary(${_pfx}Filters SHARED ${CMAKE_CURRENT_SOURCE_DIR}/Filters.i)
-
-TARGET_LINK_LIBRARIES(${_pfx}DataObjects ${cpPlugins_AllInstances})
-TARGET_LINK_LIBRARIES(${_pfx}Filters ${_pfx}DataObjects)
-
-SET(
-  fpa_AllInstances
-  ${_pfx}DataObjects
-  ${_pfx}Filters
-  CACHE INTERNAL "All valid instances." FORCE
-  )
+IF(USE_cpPlugins)
+  INCLUDE_DIRECTORIES(
+    ${PROJECT_SOURCE_DIR}/lib
+    ${PROJECT_BINARY_DIR}/lib
+    )
+  SET(_pfx fpaInstaces)
+  cpPlugins_BuildLibrary(
+    ${_pfx}DataObjects SHARED ${CMAKE_CURRENT_SOURCE_DIR}/DataObjects.i
+    )
+  cpPlugins_BuildLibrary(
+    ${_pfx}Filters SHARED ${CMAKE_CURRENT_SOURCE_DIR}/Filters.i
+    )
+  TARGET_LINK_LIBRARIES(${_pfx}DataObjects ${cpPlugins_AllInstances})
+  TARGET_LINK_LIBRARIES(${_pfx}Filters ${_pfx}DataObjects)
+  SET(
+    fpa_AllInstances
+    ${_pfx}DataObjects
+    ${_pfx}Filters
+    CACHE INTERNAL "All valid instances." FORCE
+    )
+ENDIF(USE_cpPlugins)
 
 ## eof - $RCSfile$

diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 9c2c3db8332d05ec3067310e689f0cd9f22873d9..8950a2730e1387c546a0795130c2aa8c61290baf 100644 (file)
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -39,4 +39,4 @@ IF(USE_cpPlugins)
 
 ENDIF(USE_cpPlugins)
 
-## eof - $RCSfile$
\ No newline at end of file
+## eof - $RCSfile$

diff --git a/plugins/Experiments/InsertNoiseIntoPoints.cxx b/plugins/Experiments/InsertNoiseIntoPoints.cxx
index e21f37bce29d94787cfa2638c72da440040ef9e4..0b98400b4b7a29e5007217990a18071234929f0f 100644 (file)
--- a/plugins/Experiments/InsertNoiseIntoPoints.cxx
+++ b/plugins/Experiments/InsertNoiseIntoPoints.cxx
@@ -1,6 +1,6 @@
 #include <Experiments/InsertNoiseIntoPoints.h>
 #include <cpInstances/DataObjects/Image.h>
-#include <cpInstances/Mesh.h>
+#include <cpInstances/DataObjects/Mesh.h>
 
 #include <random>
 #include <vtkImageData.h>
@@ -12,7 +12,7 @@ InsertNoiseIntoPoints( )
   : Superclass( )
 {
   typedef cpInstances::DataObjects::Image _TImage;
-  typedef cpInstances::Mesh  _TMesh;
+  typedef cpInstances::DataObjects::Mesh  _TMesh;
 
   this->_ConfigureInput< _TMesh >( "Seeds", true, false );
   this->_ConfigureInput< _TImage >( "DistanceMap", true, false );

diff --git a/plugins/Experiments/SkeletonHausdorffDistance.cxx b/plugins/Experiments/SkeletonHausdorffDistance.cxx
index 82401329d8a731db51f5f09e50110dfeee7072ee..af6fe760efb1a29e6d4045fdd7d1fbc99746fd9e 100644 (file)
--- a/plugins/Experiments/SkeletonHausdorffDistance.cxx
+++ b/plugins/Experiments/SkeletonHausdorffDistance.cxx
@@ -1,6 +1,6 @@
 #include <Experiments/SkeletonHausdorffDistance.h>
 #include <cpInstances/DataObjects/Image.h>
-#include <cpInstances/Mesh.h>
+#include <cpInstances/DataObjects/Mesh.h>
 #include <cpInstances/DataObjects/Skeleton.h>
 #include <cpExtensions/DataStructures/Skeleton.h>
 
@@ -13,9 +13,9 @@ SkeletonHausdorffDistance( )
   : Superclass( )
 {
   this->_ConfigureInput< cpInstances::DataObjects::Image >( "DistanceMap", true, false );
-  this->_ConfigureInput< cpInstances::Mesh >( "Seeds", true, false );
-  this->_ConfigureInput< cpInstances::Skeleton >( "Skeleton1", true, false );
-  this->_ConfigureInput< cpInstances::Skeleton >( "Skeleton2", true, false );
+  this->_ConfigureInput< cpInstances::DataObjects::Mesh >( "Seeds", true, false );
+  this->_ConfigureInput< cpInstances::DataObjects::Skeleton >( "Skeleton1", true, false );
+  this->_ConfigureInput< cpInstances::DataObjects::Skeleton >( "Skeleton2", true, false );
 }
 
 // -------------------------------------------------------------------------

diff --git a/plugins/ImageAlgorithms/SkeletonFilter.cxx b/plugins/ImageAlgorithms/SkeletonFilter.cxx
index 106dab2f819711fd64d123beba91a77bf4c08594..8d434c75311e23b7858d8540164824c06e12f63d 100644 (file)
--- a/plugins/ImageAlgorithms/SkeletonFilter.cxx
+++ b/plugins/ImageAlgorithms/SkeletonFilter.cxx
@@ -12,7 +12,7 @@ SkeletonFilter( )
   : Superclass( )
 {
   typedef cpInstances::DataObjects::Image    _TImage;
-  typedef cpInstances::Skeleton _TSkeleton;
+  typedef cpInstances::DataObjects::Skeleton _TSkeleton;
   typedef cpPlugins::Pipeline::DataObject _TData;
 
   this->_ConfigureInput< _TImage >( "Input", true, false );