Sync with cpPlugins

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2ada831c810ec82b4d9a722f1a2e2efb8ea8232a..2c9769bab4b0c7a8b865ceb9fe5bba597610cde7 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,18 +1,33 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 
-IF(POLICY CMP0020)
-  CMAKE_POLICY(SET CMP0020 NEW)
-ENDIF(POLICY CMP0020)
+## ============
+## = Policies =
+## ============
+
+SET(
+  policies
+  CMP0015
+  CMP0020
+  CMP0042
+  )
+FOREACH(policy ${policies})
+  IF(POLICY ${policy})
+    CMAKE_POLICY(SET ${policy} NEW)
+  ENDIF(POLICY ${policy})
+ENDFOREACH(policy)
 
 ## ================
 ## = Project name =
 ## ================
 
 PROJECT(FrontAlgorithms)
-SET(FrontAlgorithms_MAJOR_VERSION   "0")
-SET(FrontAlgorithms_MINOR_VERSION   "0")
-SET(FrontAlgorithms_RELEASE_VERSION "1")
-SET(FrontAlgorithms_VERSION "${FrontAlgorithms_MAJOR_VERSION}.${FrontAlgorithms_MINOR_VERSION}.${FrontAlgorithms_RELEASE_VERSION}")
+SET(prj_MAJOR_VERSION   "0")
+SET(prj_MINOR_VERSION   "0")
+SET(prj_RELEASE_VERSION "1")
+SET(
+  prj_VERSION
+  "${prj_MAJOR_VERSION}.${prj_MINOR_VERSION}.${prj_RELEASE_VERSION}"
+  )
 
 ## ===========
 ## = Options =
@@ -33,20 +48,8 @@ ENDIF(BUILD_SHARED_LIBS)
 
 INCLUDE(GenerateExportHeader)
 
-FIND_PACKAGE(ITK REQUIRED)
-INCLUDE(${ITK_USE_FILE})
-
-FIND_PACKAGE(VTK REQUIRED)
-INCLUDE(${VTK_USE_FILE})
-
-IF(ITKVtkGlue_LOADED)
-  MESSAGE(FATAL_ERROR "ITKVtkGlue module is available. Please re-compile your ITK without it. It could lead to nasty compilation problems... Just waiting for Kitware to solve it.")
-ENDIF(ITKVtkGlue_LOADED)
-
-OPTION(USE_cpPlugins "Build cpPlugins based stuff" OFF)
-IF(USE_cpPlugins)
-  FIND_PACKAGE(cpPlugins REQUIRED)
-ENDIF(USE_cpPlugins)
+# Find cpPlugins
+FIND_PACKAGE(cpPlugins REQUIRED)
 
 ## ================================================
 ## = Do not allow to build inside the source tree =

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 6973e3225283c3c5e5f1d688bf05bde7324b5b15..25544f558192122be693ae51efe4e6baeca6eae1 100644 (file)
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -39,11 +39,7 @@ SET(
 SET(
   ${LIB_NAME}_LINK_LIBRARIES
   ${ITK_LIBRARIES}
-  vtkFiltersSources
-  vtkInteractionWidgets
-  vtkRenderingVolumeOpenGL
-  vtkRenderingFreeTypeOpenGL
-  vtkIOMPIImage
+  ${VTK_LIBRARIES}
   )
 
 ## =====================