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

diff --git a/kernel/cmake/BBTKKernelConfig.cmake b/kernel/cmake/BBTKKernelConfig.cmake
index f5cc5d2..a2a07b0 100644
--- a/kernel/cmake/BBTKKernelConfig.cmake
+++ b/kernel/cmake/BBTKKernelConfig.cmake
@@ -20,7 +20,7 @@ IF(WIN32) # OR APPLE)
   SET (EXECUTABLE_OUTPUT_REL_PATH "") 
   SET (LIBRARY_OUTPUT_REL_PATH    "")
   IF(WIN32)
-	SET (ADDITIONAL_DLL_PATH "C:/CreaTools/lib" CACHE PATH "Additional paths in which to look for dlls")
+	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) 
@@ -35,7 +35,6 @@ SET (LIBRARY_OUTPUT_PATH
 
 
 
-
 #-----------------------------------------------------------------------------
 # The var BBTK_BIN_PATH
 # gives the system-dependent path to output binaries
@@ -59,11 +58,11 @@ IF(WIN32)
 ELSE(WIN32)
   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)
+  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(APPLE) 
+  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)
@@ -89,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)