X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=kernel%2Fcmake%2FBBTKKernelConfig.cmake;h=27149d437857495088234016cbc534b56df2b1d8;hb=7785d9f3ee33f106ad64a204d8cef883185180b0;hp=86713191cffd301d715858524063e6700bc49281;hpb=5c38217a92114aeeabd96c4ac4b398da03a4430f;p=bbtk.git

diff --git a/kernel/cmake/BBTKKernelConfig.cmake b/kernel/cmake/BBTKKernelConfig.cmake
index 8671319..27149d4 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 )
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
@@ -13,11 +14,17 @@ INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/kernel/src )
 SET(BBTK_CORE_PACKAGE TRUE)
 #----------------------------------------------------------------------------
 
-
 #-----------------------------------------------------------------------------
 # Path for binaries 
-SET (EXECUTABLE_OUTPUT_REL_PATH bin)
-SET (LIBRARY_OUTPUT_REL_PATH    bin)
+IF(WIN32)
+  SET (EXECUTABLE_OUTPUT_REL_PATH "") 
+  SET (LIBRARY_OUTPUT_REL_PATH    "")
+  SET (ADDITIONAL_DLL_PATH "C:/CreaTools/lib" CACHE PATH "Additional paths in which to look for dlls")
+ELSE(WIN32)
+  SET (EXECUTABLE_OUTPUT_REL_PATH bin) 
+  SET (LIBRARY_OUTPUT_REL_PATH    bin)
+ENDIF(WIN32)  
+
 SET (EXECUTABLE_OUTPUT_PATH 
   ${PROJECT_BINARY_DIR}/${EXECUTABLE_OUTPUT_REL_PATH})
 SET (LIBRARY_OUTPUT_PATH    
@@ -25,6 +32,8 @@ SET (LIBRARY_OUTPUT_PATH
 #-----------------------------------------------------------------------------
 
 
+
+
 #-----------------------------------------------------------------------------
 # The var BBTK_BIN_PATH
 # gives the system-dependent path to output binaries
@@ -38,14 +47,18 @@ 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_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_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)  
@@ -58,16 +71,14 @@ ENDIF(WIN32)
 # from build tree root or install tree root
 # (different on win/lin)
 IF(WIN32)
-  SET(BBTK_SHARE_REL_PATH)
+  SET(BBTK_SHARE_REL_PATH "/")
   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)   
 #-----------------------------------------------------------------------------