From 33a8c5fa1664476c826bbeb4d6ade75f23841a52 Mon Sep 17 00:00:00 2001 From: Frederic Cervenansky Date: Fri, 18 Jun 2010 21:17:14 +0000 Subject: [PATCH] Modification to allow bbfy with vs10. Need to take in count vs6, vs7 and so on? --- kernel/cmake/BBTKKernelConfig.cmake | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/kernel/cmake/BBTKKernelConfig.cmake b/kernel/cmake/BBTKKernelConfig.cmake index b3e15ca..68fe9dd 100644 --- a/kernel/cmake/BBTKKernelConfig.cmake +++ b/kernel/cmake/BBTKKernelConfig.cmake @@ -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 ! -- 2.45.1