From: Leonardo Florez-Valencia <florez-l@javeriana.edu.co>
Date: Wed, 14 Oct 2015 23:37:58 +0000 (-0500)
Subject: Merge
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=ab4b440668b2007d94345967ac154c4b20aa389f;p=FrontAlgorithms.git

Merge
---

ab4b440668b2007d94345967ac154c4b20aa389f
diff --cc CMakeLists.txt
index 2c9769b,84bf1fa..5bf1a02
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -46,10 -43,25 +46,11 @@@ ENDIF(BUILD_SHARED_LIBS
  ## = Packages =
  ## ============
  
+ # Prepare header to build shared libs (windows)
  INCLUDE(GenerateExportHeader)
  
 -# Find ITK and VTK
 -FIND_PACKAGE(ITK REQUIRED)
 -FIND_PACKAGE(VTK REQUIRED)
 -
 -INCLUDE(${ITK_USE_FILE})
 -INCLUDE(${VTK_USE_FILE})
 -
 -# Do not use itk-vtk glue --> problems ahead!!!
 -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 =