From b35b8691933b2d7f34b7f00dd817a14be7bb5ab2 Mon Sep 17 00:00:00 2001 From: Leonardo Florez-Valencia Date: Wed, 14 Oct 2015 18:36:51 -0500 Subject: [PATCH] Sync with cpPlugins --- CMakeLists.txt | 45 ++++++++++++++++++++++++--------------------- lib/CMakeLists.txt | 6 +----- 2 files changed, 25 insertions(+), 26 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2ada831..2c9769b 100644 --- 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 6973e32..25544f5 100644 --- 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} ) ## ===================== -- 2.45.1