X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fcmake%2FBBTKKernelConfig.cmake;h=94c7831b4639306678cd15dcb2b56da3e81dc7af;hb=bf1bdd88621c0556024de37768c2d17d12f2a265;hp=68fe9dd147136628d6758041a4fb4b083d5d0dec;hpb=33a8c5fa1664476c826bbeb4d6ade75f23841a52;p=bbtk.git diff --git a/kernel/cmake/BBTKKernelConfig.cmake b/kernel/cmake/BBTKKernelConfig.cmake index 68fe9dd..94c7831 100644 --- a/kernel/cmake/BBTKKernelConfig.cmake +++ b/kernel/cmake/BBTKKernelConfig.cmake @@ -44,8 +44,11 @@ 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(MSVC10) //FCY 18-06-10 + IF(MSVC10) #FCY 18-06-10 SET(BBTK_BIN_PATH $(OutDir)) ELSE(MSVC10) IF(CMAKE_GENERATOR STREQUAL "Visual Studio 6") @@ -54,14 +57,12 @@ IF(WIN32) 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 ! IF ( CMAKE_GENERATOR STREQUAL Xcode) SET(BBTK_BIN_PATH ${EXECUTABLE_OUTPUT_PATH}/Debug)