X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=kernel%2Fcmake%2FBBTKKernelConfig.cmake;h=b3e15ca43fab0308972c7ef31cd748b0e7cec69b;hb=846c9ee5de9ff3472ec5c1d8e9c62781869ce976;hp=3813133db56985331f433d6a7feaebf35f0e7933;hpb=d7e710c3fe8bd9c8c5fb79073bd5667b24c048f8;p=bbtk.git diff --git a/kernel/cmake/BBTKKernelConfig.cmake b/kernel/cmake/BBTKKernelConfig.cmake index 3813133..b3e15ca 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:/Program Files/CreaTools/crea_ThirdParty_dlls-0.2.0/bin" 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 @@ -59,11 +58,11 @@ IF(WIN32) 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)