X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fcmake%2FBBTKKernelConfig.cmake;h=f5cc5d2369cff9fbaba6d912ebfb9d77aa303429;hb=70db75992e0ccf5ad1fab5ccf9cec013877ea3d5;hp=1600776e414971618d06e6b42292df1b4cef0223;hpb=8f72b9ec6b72850975d47e4da84a9ad501e3821d;p=bbtk.git

diff --git a/kernel/cmake/BBTKKernelConfig.cmake b/kernel/cmake/BBTKKernelConfig.cmake
index 1600776..f5cc5d2 100644
--- a/kernel/cmake/BBTKKernelConfig.cmake
+++ b/kernel/cmake/BBTKKernelConfig.cmake
@@ -16,13 +16,16 @@ SET(BBTK_CORE_PACKAGE TRUE)
 
 #-----------------------------------------------------------------------------
 # Path for binaries 
-IF(WIN32)
+IF(WIN32) # OR APPLE)
   SET (EXECUTABLE_OUTPUT_REL_PATH "") 
   SET (LIBRARY_OUTPUT_REL_PATH    "")
-ELSE(WIN32)
+  IF(WIN32)
+	SET (ADDITIONAL_DLL_PATH "C:/CreaTools/lib" CACHE PATH "Additional paths in which to look for dlls")
+  ENDIF(WIN32)
+ELSE(WIN32) # OR APPLE)
   SET (EXECUTABLE_OUTPUT_REL_PATH bin) 
   SET (LIBRARY_OUTPUT_REL_PATH    bin)
-ENDIF(WIN32)  
+ENDIF(WIN32) # OR APPLE)  
 
 SET (EXECUTABLE_OUTPUT_PATH 
   ${PROJECT_BINARY_DIR}/${EXECUTABLE_OUTPUT_REL_PATH})
@@ -48,20 +51,36 @@ IF(WIN32)
   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)
   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_BBDOC ${BBTK_BIN_PATH}/bbdoc.exe)
 ELSE(WIN32)
-  SET(BBTK_BIN_PATH ${EXECUTABLE_OUTPUT_PATH})
+  SET(BBTK_LIB_PATH lib)
+# For Xcode : have to test the cmake generator !
+#  IF (APPLE)
+#    SET(BBTK_BIN_PATH ${EXECUTABLE_OUTPUT_PATH}/Debug)
+#  ELSE(APPLE)
+    SET(BBTK_BIN_PATH ${EXECUTABLE_OUTPUT_PATH})
+#  ENDIF(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)  
+SET(BBTK_PACKAGE_LIB_PATH ${BBTK_LIB_PATH})
 
+MESSAGE(STATUS "")
+MESSAGE(STATUS "===============================================")
+MESSAGE(STATUS "Setting up base pathes:")
+MESSAGE(STATUS "* BBTK_BIN_PATH         =${BBTK_BIN_PATH}")
+MESSAGE(STATUS "* BBTK_LIB_PATH         =${BBTK_LIB_PATH}")
+MESSAGE(STATUS "* BBTK_PACKAGE_LIB_PATH =${BBTK_PACKAGE_LIB_PATH}")
+MESSAGE(STATUS "* BBTK_BBI              =${BBTK_BBI}")
+MESSAGE(STATUS "* BBTK_BBS2CPP          =${BBTK_BBS2CPP}")
+MESSAGE(STATUS "* BBTK_BBC              =${BBTK_BBC}")
+MESSAGE(STATUS "* BBTK_BBFY             =${BBTK_BBFY}")
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
@@ -80,4 +99,11 @@ ELSE(WIN32)
   SET(BBTK_BBS_REL_PATH share/bbtk/bbs)
   SET(BBTK_DATA_REL_PATH share/bbtk/data)
 ENDIF(WIN32)   
+
+MESSAGE(STATUS "* BBTK_SHARE_REL_PATH   =${BBTK_SHARE_REL_PATH}")
+MESSAGE(STATUS "* BBTK_DOC_REL_PATH     =${BBTK_DOC_REL_PATH}")
+MESSAGE(STATUS "* BBTK_BBS_REL_PATH     =${BBTK_BBS_REL_PATH}")
+MESSAGE(STATUS "* BBTK_DATA_REL_PATH    =${BBTK_DATA_REL_PATH}")
+MESSAGE(STATUS "===============================================")
+
 #-----------------------------------------------------------------------------