X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fcmake%2FBBTKKernelConfig.cmake;h=a2a07b0b7d7707ff1efb547dd2cd91d6e56913dc;hb=f5d5e297c656fb1304cccd72e9ac347c0bddbd09;hp=cfb63e7dba28a54b8d2ed64d94575bb114067d8b;hpb=a86e449e78ba07cd05cb267efea47eef2c6ab51a;p=bbtk.git

diff --git a/kernel/cmake/BBTKKernelConfig.cmake b/kernel/cmake/BBTKKernelConfig.cmake
index cfb63e7..a2a07b0 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,8 +16,17 @@ SET(BBTK_CORE_PACKAGE TRUE)
 
 #-----------------------------------------------------------------------------
 # Path for binaries 
-SET (EXECUTABLE_OUTPUT_REL_PATH bin)
-SET (LIBRARY_OUTPUT_REL_PATH    bin)
+IF(WIN32) # OR APPLE)
+  SET (EXECUTABLE_OUTPUT_REL_PATH "") 
+  SET (LIBRARY_OUTPUT_REL_PATH    "")
+  IF(WIN32)
+	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")
+  ENDIF(WIN32)
+ELSE(WIN32) # OR APPLE)
+  SET (EXECUTABLE_OUTPUT_REL_PATH bin) 
+  SET (LIBRARY_OUTPUT_REL_PATH    bin)
+ENDIF(WIN32) # OR APPLE)  
+
 SET (EXECUTABLE_OUTPUT_PATH 
   ${PROJECT_BINARY_DIR}/${EXECUTABLE_OUTPUT_REL_PATH})
 SET (LIBRARY_OUTPUT_PATH    
@@ -24,6 +34,7 @@ SET (LIBRARY_OUTPUT_PATH
 #-----------------------------------------------------------------------------
 
 
+
 #-----------------------------------------------------------------------------
 # The var BBTK_BIN_PATH
 # gives the system-dependent path to output binaries
@@ -37,18 +48,38 @@ IF(WIN32)
   IF(CMAKE_GENERATOR STREQUAL "Visual Studio 6")
     SET(BBTK_BIN_PATH ${EXECUTABLE_OUTPUT_PATH}/$(IntDir))
   ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 6")
-    SET(BBTK_BIN_PATH $(SolutionDir)/bin/$(OutDir))
+    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 ( CMAKE_GENERATOR STREQUAL Xcode)
+    SET(BBTK_BIN_PATH ${EXECUTABLE_OUTPUT_PATH}/Debug)
+  ELSE(CMAKE_GENERATOR STREQUAL Xcode)
+    SET(BBTK_BIN_PATH ${EXECUTABLE_OUTPUT_PATH})
+  ENDIF(CMAKE_GENERATOR STREQUAL Xcode) 
   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}")
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
@@ -57,16 +88,22 @@ ENDIF(WIN32)
 # from build tree root or install tree root
 # (different on win/lin)
 IF(WIN32)
-  SET(BBTK_SHARE_REL_PATH / )
+  # A trick to install in root install dir (problem when empty path given)
+  SET(BBTK_SHARE_REL_PATH "bin/..")
   SET(BBTK_DOC_REL_PATH doc)
   SET(BBTK_BBS_REL_PATH bbs)
-  #  SET(BBTK_RSC_REL_PATH rsc)
   SET(BBTK_DATA_REL_PATH data)
 ELSE(WIN32)
   SET(BBTK_SHARE_REL_PATH share/bbtk)
   SET(BBTK_DOC_REL_PATH share/bbtk/doc)
   SET(BBTK_BBS_REL_PATH share/bbtk/bbs)
-  #  SET(BBTK_RSC_REL_PATH share/bbtk/rsc)
   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 "===============================================")
+
 #-----------------------------------------------------------------------------