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

diff --git a/kernel/cmake/BBTKKernelConfig.cmake b/kernel/cmake/BBTKKernelConfig.cmake
index d5e4dd8..a2a07b0 100644
--- a/kernel/cmake/BBTKKernelConfig.cmake
+++ b/kernel/cmake/BBTKKernelConfig.cmake
@@ -16,14 +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    "")
-  SET (ADDITIONAL_DLL_PATH "C:/CreaTools/lib" CACHE PATH "Additional paths in which to look for dlls")
-ELSE(WIN32)
+  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)  
+ENDIF(WIN32) # OR APPLE)  
 
 SET (EXECUTABLE_OUTPUT_PATH 
   ${PROJECT_BINARY_DIR}/${EXECUTABLE_OUTPUT_REL_PATH})
@@ -33,7 +35,6 @@ SET (LIBRARY_OUTPUT_PATH
 
 
 
-
 #-----------------------------------------------------------------------------
 # The var BBTK_BIN_PATH
 # gives the system-dependent path to output binaries
@@ -56,7 +57,12 @@ IF(WIN32)
   SET(BBTK_BBFY ${BBTK_BIN_PATH}/bbfy.exe)
 ELSE(WIN32)
   SET(BBTK_LIB_PATH lib)
-  SET(BBTK_BIN_PATH ${EXECUTABLE_OUTPUT_PATH})
+# 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)
@@ -64,6 +70,9 @@ ELSE(WIN32)
 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}")
@@ -79,7 +88,8 @@ MESSAGE(STATUS "* BBTK_BBFY             =${BBTK_BBFY}")
 # 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_DATA_REL_PATH data)
@@ -94,5 +104,6 @@ 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 "===============================================")
 
 #-----------------------------------------------------------------------------