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

diff --git a/kernel/cmake/BBTKKernelConfig.cmake b/kernel/cmake/BBTKKernelConfig.cmake
index f5cc5d2..94c7831 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-3.0.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
@@ -45,25 +44,31 @@ SET (LIBRARY_OUTPUT_PATH
 # WARNING : 
 # On WIN32, these paths will only be right at *BUILD TIME* in VS6 or .net
 # Cannot be used at cmake run time !
+
+SET(BBTK_LIB_PATH ${CMAKE_CREA_LIB_PATH} )
+
 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)/$(OutDir))
-  ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 6")
-  SET(BBTK_LIB_PATH bin)
+  IF(MSVC10)  #FCY 18-06-10
+	  SET(BBTK_BIN_PATH $(OutDir))
+  ELSE(MSVC10)
+	  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)/$(OutDir))
+	  ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 6")
+  ENDIF(MSVC10)
   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)
+
 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 +94,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)