X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=kernel%2Fcmake%2FBBTKConfigurePackagePaths.cmake;h=e49161f0f1c5496c24dc36b6cc4757fc6e1f82b7;hb=72e6ce35980bef087d93c8a2d2a687e5179f0f6c;hp=bf6cfcf8ef358aec801bc087fa7a1b82d5702f3c;hpb=1fd0a4edc8f7e8d5444788662f59c4384a9aab93;p=bbtk.git

diff --git a/kernel/cmake/BBTKConfigurePackagePaths.cmake b/kernel/cmake/BBTKConfigurePackagePaths.cmake
index bf6cfcf..e49161f 100644
--- a/kernel/cmake/BBTKConfigurePackagePaths.cmake
+++ b/kernel/cmake/BBTKConfigurePackagePaths.cmake
@@ -1,17 +1,53 @@
-# Use the installed appli 
+
+
 
 IF(WIN32)
-  FILE(TO_NATIVE_PATH  ${PROJECT_BINARY_DIR}/$(OutDir)  BBTK_BIN_PATH)
+  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_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_BBDOC "${BBTK_BIN_PATH}/bbdoc")
+  
 ELSE(WIN32)
-  FILE(TO_NATIVE_PATH  ${PROJECT_BINARY_DIR}/bin  BBTK_BIN_PATH)
+#  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_BBDOC "${BBTK_BIN_PATH}/bbdoc")  
 ENDIF(WIN32)
 
-# TO DO : use computed path for build/install tree
-SET(BBTK_BBI "${BBTK_DIR}/bin/bbi")
-SET(BBTK_BBS2CPP "${BBTK_DIR}/bin/bbs2cpp")
-SET(BBTK_BBC "${BBTK_DIR}/bin/bbc")
-SET(BBTK_BBFY "${BBTK_DIR}/bin/bbfy")
-SET(BBTK_BBDOC "${BBTK_DIR}/bin/bbdoc")
 
 INCLUDE(${BBTK_CMAKE_DIR}/BBTKSetDeducedPaths.cmake)