]> Creatis software - bbtk.git/commitdiff
Modification to allow bbfy with vs10. Need to take in count vs6, vs7 and so on?
authorFrederic Cervenansky <Frederic.Cervenansky@creatis.insa-lyon.fr>
Fri, 18 Jun 2010 21:17:14 +0000 (21:17 +0000)
committerFrederic Cervenansky <Frederic.Cervenansky@creatis.insa-lyon.fr>
Fri, 18 Jun 2010 21:17:14 +0000 (21:17 +0000)
kernel/cmake/BBTKKernelConfig.cmake

index b3e15ca43fab0308972c7ef31cd748b0e7cec69b..68fe9dd147136628d6758041a4fb4b083d5d0dec 100644 (file)
@@ -45,16 +45,21 @@ SET (LIBRARY_OUTPUT_PATH
 # On WIN32, these paths will only be right at *BUILD TIME* in VS6 or .net
 # Cannot be used at cmake run time !
 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")
+  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_LIB_PATH bin)
   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 !