X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fcmake%2FBBTKConfigurePackagePaths.cmake;h=634a2a7bbbe86874a981a0628365395583a8f54d;hb=19c9e9989a6be039aac2daac660e9133ee578ed7;hp=e49161f0f1c5496c24dc36b6cc4757fc6e1f82b7;hpb=72e6ce35980bef087d93c8a2d2a687e5179f0f6c;p=bbtk.git

diff --git a/kernel/cmake/BBTKConfigurePackagePaths.cmake b/kernel/cmake/BBTKConfigurePackagePaths.cmake
index e49161f..634a2a7 100644
--- a/kernel/cmake/BBTKConfigurePackagePaths.cmake
+++ b/kernel/cmake/BBTKConfigurePackagePaths.cmake
@@ -1,6 +1,33 @@
+ # ---------------------------------------------------------------------
+ #
+ # 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.
+ # ------------------------------------------------------------------------ */
 
 
 
+
+SET(BBTK_PACKAGE_LIB_PATH ${CMAKE_CREA_LIB_PATH} )
+
 IF(WIN32)
   SET (EXECUTABLE_OUTPUT_REL_PATH "") 
   SET (LIBRARY_OUTPUT_REL_PATH    "")
@@ -16,35 +43,22 @@ IF(WIN32)
 
 ##  SET (ADDITIONAL_DLL_PATH "C:/Program Files/CreaTools/crea_ThirdParty_dlls-0.2.0/bin" CACHE PATH "Additional paths in which to look for dlls")
 
-  SET(BBTK_PACKAGE_LIB_PATH bin)
   SET(BBTK_BBI "${BBTK_BIN_PATH}/bbi")
   SET(BBTK_BBS2CPP "${BBTK_BIN_PATH}/bbs2cpp")
   SET(BBTK_BBC "${BBTK_BIN_PATH}/bbc")
   SET(BBTK_BBFY "${BBTK_BIN_PATH}/bbfy")
+  SET(BBTK_BBPCONFIGURATOR "${BBTK_BIN_PATH}/bbpConfigurator")
   SET(BBTK_BBDOC "${BBTK_BIN_PATH}/bbdoc")
   
 ELSE(WIN32)
 #  SET (EXECUTABLE_OUTPUT_REL_PATH bin) 
 #  SET (LIBRARY_OUTPUT_REL_PATH    bin)
   SET(BBTK_BIN_PATH ${BBTK_INSTALL_PREFIX}/bin)
-
-	if( NOT APPLE )
-		# check 64 bit
-		if( ${CMAKE_SIZEOF_VOID_P} EQUAL 4 )
-			set( HAVE_64_BIT 0 )
-			SET(BBTK_PACKAGE_LIB_PATH lib)
-		else( ${CMAKE_SIZEOF_VOID_P}EQUAL 4 )
-			set( HAVE_64_BIT 1 )
-			SET(BBTK_PACKAGE_LIB_PATH lib64)
-		endif( ${CMAKE_SIZEOF_VOID_P} EQUAL 4 )
-	 endif( NOT APPLE )
-
-
-
   SET(BBTK_BBI "${BBTK_BIN_PATH}/bbi")
   SET(BBTK_BBS2CPP "${BBTK_BIN_PATH}/bbs2cpp")
   SET(BBTK_BBC "${BBTK_BIN_PATH}/bbc")
   SET(BBTK_BBFY "${BBTK_BIN_PATH}/bbfy")
+  SET(BBTK_BBPCONFIGURATOR "${BBTK_BIN_PATH}/bbpConfigurator")
   SET(BBTK_BBDOC "${BBTK_BIN_PATH}/bbdoc")  
 ENDIF(WIN32)