X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=kernel%2Fcmake%2FBBTKKernelConfig.cmake;h=dc2584328a7bc59e24fe8448216ccbf5fb648fd6;hb=b324b7e01f19042425f979066aeada6ec4529e98;hp=b3e15ca43fab0308972c7ef31cd748b0e7cec69b;hpb=d6a3121dd19dec63c484cd1eeeda57bd7edb8442;p=bbtk.git

diff --git a/kernel/cmake/BBTKKernelConfig.cmake b/kernel/cmake/BBTKKernelConfig.cmake
index b3e15ca..dc25843 100644
--- a/kernel/cmake/BBTKKernelConfig.cmake
+++ b/kernel/cmake/BBTKKernelConfig.cmake
@@ -1,3 +1,29 @@
+ # ---------------------------------------------------------------------
+ #
+ # 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.
+ # ------------------------------------------------------------------------ */
+
+
 
 #----------------------------------------------------------------------------
 # BINARY DIR MUST BE IN INCLUDE DIRS 
@@ -44,19 +70,26 @@ SET (LIBRARY_OUTPUT_PATH
 # WARNING : 
 # On WIN32, these paths will only be right at *BUILD TIME* in VS6 or .net
 # Cannot be used at cmake run time !
+
+SET(BBTK_LIB_PATH ${CMAKE_CREA_LIB_PATH} )
+
 IF(WIN32)
-  IF(CMAKE_GENERATOR STREQUAL "Visual Studio 6")
-    SET(BBTK_BIN_PATH ${EXECUTABLE_OUTPUT_PATH}/$(IntDir))
-  ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 6")
-    SET(BBTK_BIN_PATH $(SolutionDir)/$(OutDir))
-  ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 6")
-  SET(BBTK_LIB_PATH bin)
+  IF(MSVC10)  #FCY 18-06-10
+	  SET(BBTK_BIN_PATH $(OutDir))
+  ELSE(MSVC10)
+	  IF(CMAKE_GENERATOR STREQUAL "Visual Studio 6")
+	    SET(BBTK_BIN_PATH ${EXECUTABLE_OUTPUT_PATH}/$(IntDir))
+	  ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 6")
+	    SET(BBTK_BIN_PATH $(SolutionDir)/$(OutDir))
+	  ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 6")
+  ENDIF(MSVC10)
   SET(BBTK_BBS2CPP ${BBTK_BIN_PATH}/bbs2cpp.exe)
   SET(BBTK_BBC ${BBTK_BIN_PATH}/bbc.exe)
   SET(BBTK_BBI ${BBTK_BIN_PATH}/bbi.exe)
   SET(BBTK_BBFY ${BBTK_BIN_PATH}/bbfy.exe)
+  SET(BBTK_BBPCONFIGURATOR ${BBTK_BIN_PATH}/bbpConfigurator.exe)
+
 ELSE(WIN32)
-  SET(BBTK_LIB_PATH lib)
 # For Xcode : have to test the cmake generator !
   IF ( CMAKE_GENERATOR STREQUAL Xcode)
     SET(BBTK_BIN_PATH ${EXECUTABLE_OUTPUT_PATH}/Debug)
@@ -67,6 +100,7 @@ ELSE(WIN32)
   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)
 ENDIF(WIN32)  
 SET(BBTK_PACKAGE_LIB_PATH ${BBTK_LIB_PATH})
 
@@ -80,6 +114,7 @@ MESSAGE(STATUS "* BBTK_BBI              =${BBTK_BBI}")
 MESSAGE(STATUS "* BBTK_BBS2CPP          =${BBTK_BBS2CPP}")
 MESSAGE(STATUS "* BBTK_BBC              =${BBTK_BBC}")
 MESSAGE(STATUS "* BBTK_BBFY             =${BBTK_BBFY}")
+MESSAGE(STATUS "* BBTK_BBPCONFIGURATOR  =${BBTK_BBPCONFIGURATOR}")
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------