X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fcmake%2FBBTKConfigurePackagePaths.cmake;h=f45b308b54f8a704f7af60bafe8cc14eacec0fdd;hb=2d8aec5f22b1f93422cdd08b4e38d453b93f1392;hp=a40daf51e0f053caf7c215b23f7382db4d24b0dc;hpb=4b6378ebef2d7d8e891f956a6c557a5c9e51b075;p=bbtk.git

diff --git a/kernel/cmake/BBTKConfigurePackagePaths.cmake b/kernel/cmake/BBTKConfigurePackagePaths.cmake
index a40daf5..f45b308 100644
--- a/kernel/cmake/BBTKConfigurePackagePaths.cmake
+++ b/kernel/cmake/BBTKConfigurePackagePaths.cmake
@@ -1,9 +1,39 @@
-# Use the installed appli 
-SET(BBTK_BIN_PATH ${PROJECT_BINARY_DIR})
-# TO DO : use computed path for build/install tree
-SET(BBTK_BBI bbi)
-SET(BBTK_BBFY bbfy)
-SET(BBTK_BBDOC bbdoc)
+
+
+SET(BBTK_PACKAGE_LIB_PATH ${CMAKE_CREA_LIB_PATH} )
+
+IF(WIN32)
+  SET (EXECUTABLE_OUTPUT_REL_PATH "") 
+  SET (LIBRARY_OUTPUT_REL_PATH    "")
+#  FILE(TO_NATIVE_PATH  ${PROJECT_BINARY_DIR}/$(OutDir)  BBTK_BIN_PATH)
+#  SET(BBTK_BIN_PATH ${BBTK_DIR}/bin})
+#  FIND_FILE(PATHS ${BBTK_BIN_PATH})
+
+  FIND_PATH(BBTK_BIN_PATH bbi.exe ${BBTK_DIR}/bin ${BBTK_DIR}/Release ${BBTK_DIR}/RelWithDebInfo ${BBTK_DIR}/Debug NO_DEFAULT_PATH)
+
+  IF(NOT BBTK_BIN_PATH)
+    MESSAGE(FATAL_ERROR "bbi not found in ${BBTK_DIR}/bin ; ${BBTK_DIR}/Release ; ${BBTK_DIR}/Debug ; ${BBTK_DIR}/RelWithDebInfo : is bbtk properly built ?")
+  ENDIF(NOT BBTK_BIN_PATH)
+
+##  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_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_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)
+  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_BBDOC "${BBTK_BIN_PATH}/bbdoc")  
+ENDIF(WIN32)
+
 
 INCLUDE(${BBTK_CMAKE_DIR}/BBTKSetDeducedPaths.cmake)