X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fcmake%2FBBTKSetDeducedPaths.cmake;h=c39d4c030e03d5c3570157ae6ae5e9e8691060e2;hb=1fd0a4edc8f7e8d5444788662f59c4384a9aab93;hp=56d5e08ba8ec7eb13a1916cabcc444dada3261bf;hpb=57a2a3a3ab4669eda75ee20ef040884d9a54fdac;p=bbtk.git

diff --git a/kernel/cmake/BBTKSetDeducedPaths.cmake b/kernel/cmake/BBTKSetDeducedPaths.cmake
index 56d5e08..c39d4c0 100644
--- a/kernel/cmake/BBTKSetDeducedPaths.cmake
+++ b/kernel/cmake/BBTKSetDeducedPaths.cmake
@@ -8,18 +8,20 @@ SET(BBTK_DOC_BUILD_PATH ${PROJECT_BINARY_DIR}/${BBTK_DOC_REL_PATH})
 SET(BBTK_BBDOC_BUILD_PATH ${PROJECT_BINARY_DIR}/${BBTK_BBDOC_REL_PATH})
 SET(BBTK_DOXYGEN_BUILD_PATH ${PROJECT_BINARY_DIR}/${BBTK_DOXYGEN_REL_PATH})
 SET(BBTK_BBS_BUILD_PATH ${PROJECT_BINARY_DIR}/${BBTK_BBS_REL_PATH})
+SET(BBTK_DATA_BUILD_PATH ${PROJECT_BINARY_DIR}/${BBTK_DATA_REL_PATH})
 
 SET(BBTK_DOC_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/${BBTK_DOC_REL_PATH})
 SET(BBTK_BBDOC_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/${BBTK_BBDOC_REL_PATH})
 SET(BBTK_DOXYGEN_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/${BBTK_DOXYGEN_REL_PATH})
 SET(BBTK_BBS_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/${BBTK_BBS_REL_PATH})
+SET(BBTK_DATA_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/${BBTK_DATA_REL_PATH})
 
 # Create build directories if necessary
 MKDIR(${BBTK_DOC_BUILD_PATH})
 MKDIR(${BBTK_BBDOC_BUILD_PATH})
 MKDIR(${BBTK_DOXYGEN_BUILD_PATH})
-MKDIR(${BBTK_DOXYGEN_BUILD_PATH})
 MKDIR(${BBTK_BBS_BUILD_PATH})
+MKDIR(${BBTK_DATA_BUILD_PATH})
 
 #-----------------------------------------------------------------------------
 SET (EXECUTABLE_OUTPUT_PATH 
@@ -38,18 +40,25 @@ SET(CMakeCreateFindPackage_DIR ${BBTK_CMAKE_DIR})
 #-----------------------------------------------------------------------------
 # Dependencies added only the first time !
 IF(BBTK_CORE_PACKAGE)
-  IF(EXISTS ${BBTK_BBI})
+
+  IF(EXISTS "${BBTK_BBI}")
     SET(BBTK_BBI_DEPENDENCY)
-  ELSE(EXISTS ${BBTK_BBI})
+  ELSE(EXISTS "${BBTK_BBI}")
     SET(BBTK_BBI_DEPENDENCY ${BBTK_BBI})
-  ENDIF(EXISTS ${BBTK_BBI})
+  ENDIF(EXISTS "${BBTK_BBI}")
   
+  IF(EXISTS "${BBTK_BBS2CPP}")
+    SET(BBTK_BBS2CPP_DEPENDENCY)
+  ELSE(EXISTS "${BBTK_BBS2CPP}")
+    SET(BBTK_BBS2CPP_DEPENDENCY ${BBTK_BBS2CPP})
+  ENDIF(EXISTS "${BBTK_BBS2CPP}")
   
-  IF(EXISTS ${BBTK_BBFY})
+  IF(EXISTS "${BBTK_BBFY}")
     SET(BBTK_BBFY_DEPENDENCY)
-  ELSE(EXISTS ${BBTK_BBFY})
+  ELSE(EXISTS "${BBTK_BBFY}")
     SET(BBTK_BBFY_DEPENDENCY ${BBTK_BBFY})
-  ENDIF(EXISTS ${BBTK_BBFY})
+  ENDIF(EXISTS "${BBTK_BBFY}")
+
 ENDIF(BBTK_CORE_PACKAGE)
 #-----------------------------------------------------------------------------