X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fcmake%2FBBTKKernelConfig.cmake;h=af6456f3218b8bccca1039c502ac275cc447f7d4;hb=2d2fc4c6349d5040a9f13a240f079e7a1c6687dd;hp=e909c90f428f85f0840a5505b917912164c008dc;hpb=1cad1aa48a5353dc6844018dc8b756f876e17394;p=bbtk.git

diff --git a/kernel/cmake/BBTKKernelConfig.cmake b/kernel/cmake/BBTKKernelConfig.cmake
index e909c90..af6456f 100644
--- a/kernel/cmake/BBTKKernelConfig.cmake
+++ b/kernel/cmake/BBTKKernelConfig.cmake
@@ -6,6 +6,7 @@ INCLUDE_DIRECTORIES( ${PROJECT_BINARY_DIR}/kernel/src )
 # SOURCES DIR MUST ALSO BE IN INCLUDE DIRS FOR FILES COMPILED IN BINARY DIR 
 # WHICH NEED TO INCLUDE OTHER FILES OF THE PACKAGE
 INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/kernel/src )
+INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/kernel/src/ThirdParty )
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
@@ -15,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})
@@ -29,6 +33,9 @@ SET (LIBRARY_OUTPUT_PATH
   ${PROJECT_BINARY_DIR}/${LIBRARY_OUTPUT_REL_PATH})
 #-----------------------------------------------------------------------------
 
+
+
+
 #-----------------------------------------------------------------------------
 # The var BBTK_BIN_PATH
 # gives the system-dependent path to output binaries
@@ -44,16 +51,33 @@ 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 "* 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}")
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
@@ -72,4 +96,10 @@ 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}")
+
 #-----------------------------------------------------------------------------