X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fcmake%2FBBTKKernelConfig.cmake;h=e909c90f428f85f0840a5505b917912164c008dc;hb=4a17a289103f77885e288aaae250e57c91ae3424;hp=a1462c423990ebe7258307e2aca2002691f707e1;hpb=9edc48dd1cb5a2fe6a09d147eed459cb6e9f0fca;p=bbtk.git

diff --git a/kernel/cmake/BBTKKernelConfig.cmake b/kernel/cmake/BBTKKernelConfig.cmake
index a1462c4..e909c90 100644
--- a/kernel/cmake/BBTKKernelConfig.cmake
+++ b/kernel/cmake/BBTKKernelConfig.cmake
@@ -15,15 +15,20 @@ 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    "")
+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    
   ${PROJECT_BINARY_DIR}/${LIBRARY_OUTPUT_REL_PATH})
 #-----------------------------------------------------------------------------
 
-
 #-----------------------------------------------------------------------------
 # The var BBTK_BIN_PATH
 # gives the system-dependent path to output binaries
@@ -37,7 +42,7 @@ 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_BBI ${BBTK_BIN_PATH}/bbi.exe)
   SET(BBTK_BBFY ${BBTK_BIN_PATH}/bbfy.exe)
@@ -57,16 +62,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)   
 #-----------------------------------------------------------------------------