X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fitkvtk%2FConfigure.cmake;h=6dab6bff0003cc7d98f7731f1afddac8f35ddf9e;hb=afd25e07d15ac97d576d94d01927d092e7f990f5;hp=946aaf6260f617f37b8f04ff39ab554a262eab2e;hpb=cf6eb7c340117809171dc171cbd7a2ba88e91be4;p=bbtk.git

diff --git a/packages/itkvtk/Configure.cmake b/packages/itkvtk/Configure.cmake
index 946aaf6..6dab6bf 100644
--- a/packages/itkvtk/Configure.cmake
+++ b/packages/itkvtk/Configure.cmake
@@ -1,73 +1,61 @@
-#-----------------------------------------------------------------------------
+ # ---------------------------------------------------------------------
+ #
+ # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+ #                        pour la SantÈ)
+ # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+ # Previous Authors : Laurent Guigues, Jean-Pierre Roux
+ # CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+ #
+ #  This software is governed by the CeCILL-B license under French law and
+ #  abiding by the rules of distribution of free software. You can  use,
+ #  modify and/ or redistribute the software under the terms of the CeCILL-B
+ #  license as circulated by CEA, CNRS and INRIA at the following URL
+ #  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+ #  or in the file LICENSE.txt.
+ #
+ #  As a counterpart to the access to the source code and  rights to copy,
+ #  modify and redistribute granted by the license, users are provided only
+ #  with a limited warranty  and the software's author,  the holder of the
+ #  economic rights,  and the successive licensors  have only  limited
+ #  liability.
+ #
+ #  The fact that you are presently reading this means that you have had
+ #  knowledge of the CeCILL-B license and that you accept its terms.
+ # ------------------------------------------------------------------------ */
+
+
+#===========================================================================
 # DOES THE USER WANT TO BUILD THE PACKAGE ?
 OPTION(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME} 
   "Build the bbtk package ${BBTK_PACKAGE_NAME} ?" OFF)
-#-----------------------------------------------------------------------------
-
-#-----------------------------------------------------------------------------
-IF(BBTK_CORE_PACKAGE)
-  IF(NOT ${BBTK_PACKAGE_NAME}_EXCLUDE_FROM_BUILD_ALL)
-    SWITCH_ON_IF_BUILD_ALL(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME})
-  ENDIF(NOT ${BBTK_PACKAGE_NAME}_EXCLUDE_FROM_BUILD_ALL)
-ENDIF(BBTK_CORE_PACKAGE)
-#-----------------------------------------------------------------------------
+#===========================================================================
 
-
-#-----------------------------------------------------------------------------
-# IF THE USER HAS CHOSEN TO BUILD THE PACKAGE
 IF(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME})
-  #---------------------------------------------------------------------------
-  
+  #===========================================================================
+  # THE USER HAS CHOSEN TO BUILD THE PACKAGE  
+  #===========================================================================
+
   #===========================================================================
   # If the package is not a "core" bbtk package (included into the toolkit)
-  # then we have to find (and use) bbtk 
+  # then we have to find and use bbtk 
   IF(NOT BBTK_CORE_PACKAGE)
-    #-------------------------------------------------------------------------
-    # Find and use the Black Box Toolkit
-    # Search BBTK
-    FIND_PACKAGE(BBTK)
-    # If bbtk found
-    IF(BBTK_FOUND)
-      INCLUDE(${BBTK_USE_FILE})
-      SET(BBTK_PACKAGE_LIBS 
-	${BBTK_PACKAGE_LIBS}
-	${BBTK_LIBRARIES})
-      MARK_AS_ADVANCED(BBTK_DIR)
-    ENDIF(BBTK_FOUND)
+    FIND_PACKAGE(BBTK REQUIRED)
+    INCLUDE(${BBTK_USE_FILE})
   ENDIF(NOT BBTK_CORE_PACKAGE)
-    
-  #===========================================================================
-  # Include package configuration cmake script from bbtk dir
-  INCLUDE(${BBTK_CMAKE_DIR}/BBTKConfigurePackage.cmake)
   #===========================================================================
   
+  #===========================================================================
+  # Include package configuration cmake script from bbtk cmake dir
+  INCLUDE(${BBTK_CMAKE_DIR}/BBTKConfigurePackage.cmake)
+  #=========================================================================== 
   
-  #---------------------------------------------------------------------------
 ELSE(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME})
-  #-------------------------------------------------------------------------
-  
-  #-----------------------------------------------------------------------
+
+  #===========================================================================
+  # Else if it is a core package we have to reset some things...
   IF(BBTK_CORE_PACKAGE)
-    #-----------------------------------------------------------------------
-    # If package deps in global deps : reset global deps
-    IF(${BBTK_PACKAGE_NAME}_IN_DEPS)
-      SET(BBTK_PACKAGES_DEPS "" CACHE INTERNAL 
-	"bbtk packages dependencies" FORCE)
-      #    STRING(REPLACE "${${BBTK_PACKAGE_NAME}_DEPS};"
-      #      "" TEMP
-      #      ${BBTK_PACKAGES_DEPS})
-      #    
-      #    SET(BBTK_PACKAGES_DEPS ${TEMP}
-      #      CACHE INTERNAL "bbtk packages dependencies" FORCE)
-    ENDIF(${BBTK_PACKAGE_NAME}_IN_DEPS)
-    #-----------------------------------------------------------------------
-    
-    #-----------------------------------------------------------------------
-    # Remove the package include scripts to avoid loading it by include * 
-    FILE(REMOVE ${BBTK_BBS_BUILD_PATH}/${BBTK_PACKAGE_NAME}.bbs)
-    FILE(REMOVE ${BBTK_BBS_BUILD_PATH}/${BBTK_PACKAGE_NAME}-appli.bbs)
-    #-----------------------------------------------------------------------
+    INCLUDE(${BBTK_CMAKE_DIR}/BBTKConfigurePackage_BuildOff.cmake)   
   ENDIF(BBTK_CORE_PACKAGE)
-  
-  #-------------------------------------------------------------------------
+  #===========================================================================
+
 ENDIF(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME})