X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=kernel%2Fcmake%2FBBTKSetDeducedPaths.cmake;h=914e4dd1c69918fbdf34ad5edeb266797d80fd69;hb=8f72b9ec6b72850975d47e4da84a9ad501e3821d;hp=c314293c98147f4f3acc97930fae8a9528ed376c;hpb=9244821a79f4853a78564d37b993b48d4b2ad4e9;p=bbtk.git

diff --git a/kernel/cmake/BBTKSetDeducedPaths.cmake b/kernel/cmake/BBTKSetDeducedPaths.cmake
index c314293..914e4dd 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_DOC_INSTALL_PATH ${BBTK_INSTALL_PREFIX}/${BBTK_DOC_REL_PATH})
+SET(BBTK_BBDOC_INSTALL_PATH ${BBTK_INSTALL_PREFIX}/${BBTK_BBDOC_REL_PATH})
+SET(BBTK_DOXYGEN_INSTALL_PATH ${BBTK_INSTALL_PREFIX}/${BBTK_DOXYGEN_REL_PATH})
+SET(BBTK_BBS_INSTALL_PATH ${BBTK_INSTALL_PREFIX}/${BBTK_BBS_REL_PATH})
+SET(BBTK_DATA_INSTALL_PATH ${BBTK_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 
@@ -37,18 +39,37 @@ SET(CMakeCreateFindPackage_DIR ${BBTK_CMAKE_DIR})
 
 #-----------------------------------------------------------------------------
 # Dependencies added only the first time !
-IF(EXISTS ${BBTK_BBI})
-  SET(BBTK_BBI_DEPENDENCY)
-ELSE(EXISTS ${BBTK_BBI})
-  SET(BBTK_BBI_DEPENDENCY ${BBTK_BBI})
-ENDIF(EXISTS ${BBTK_BBI})
+IF(BBTK_CORE_PACKAGE)
+
+  IF(EXISTS "${BBTK_BBI}")
+    SET(BBTK_BBI_DEPENDENCY)
+  ELSE(EXISTS "${BBTK_BBI}")
+    SET(BBTK_BBI_DEPENDENCY ${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}")
+    SET(BBTK_BBFY_DEPENDENCY)
+  ELSE(EXISTS "${BBTK_BBFY}")
+    SET(BBTK_BBFY_DEPENDENCY ${BBTK_BBFY})
+  ENDIF(EXISTS "${BBTK_BBFY}")
 
+ENDIF(BBTK_CORE_PACKAGE)
+#-----------------------------------------------------------------------------
 
-IF(EXISTS ${BBTK_BBFY})
-  SET(BBTK_BBFY_DEPENDENCY)
-ELSE(EXISTS ${BBTK_BBFY})
-  SET(BBTK_BBFY_DEPENDENCY ${BBTK_BBFY})
-ENDIF(EXISTS ${BBTK_BBFY})
 
 #-----------------------------------------------------------------------------
+IF(WIN32)
+  SET(CREA_ADDITIONAL_DLL_PATH "C:/CreaTools/lib" CACHE PATH "Addictional paths in which to look for dlls")
+  SET(CREA_PATH0 Path=${CREA_ADDITIONAL_DLL_PATH}__RR__%WXWIN%/lib/vc_dll/__RR__%VTK_DIR%__RR__%ITK_DIR%/../../bin/__RR__%PATH%__RR__${DOT_DIR})
+  STRING(REPLACE "__RR__" "\;" CREA_PATH ${CREA_PATH0} )
+ENDIF(WIN32)
+#-----------------------------------------------------------------------------
+
+