X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fcmake%2FBBTKConfigurePackagePaths.cmake;h=f45b308b54f8a704f7af60bafe8cc14eacec0fdd;hb=1688b52778caa9985ecea38aad38341817e0401a;hp=f2764198fe776c511b274ab97f60779a8e5655c7;hpb=b6f42788df27ba78ec951c9a9b2a11d74c6c7c5e;p=bbtk.git diff --git a/kernel/cmake/BBTKConfigurePackagePaths.cmake b/kernel/cmake/BBTKConfigurePackagePaths.cmake index f276419..f45b308 100644 --- a/kernel/cmake/BBTKConfigurePackagePaths.cmake +++ b/kernel/cmake/BBTKConfigurePackagePaths.cmake @@ -1,4 +1,7 @@ + +SET(BBTK_PACKAGE_LIB_PATH ${CMAKE_CREA_LIB_PATH} ) + IF(WIN32) SET (EXECUTABLE_OUTPUT_REL_PATH "") SET (LIBRARY_OUTPUT_REL_PATH "") @@ -6,13 +9,14 @@ IF(WIN32) # SET(BBTK_BIN_PATH ${BBTK_DIR}/bin}) # FIND_FILE(PATHS ${BBTK_BIN_PATH}) - FIND_PATH(BBTK_BIN_PATH bbi.exe ${BBTK_DIR}/bin ${BBTK_DIR}/Release ${BBTK_DIR}/Debug NO_DEFAULT_PATH) + FIND_PATH(BBTK_BIN_PATH bbi.exe ${BBTK_DIR}/bin ${BBTK_DIR}/Release ${BBTK_DIR}/RelWithDebInfo ${BBTK_DIR}/Debug NO_DEFAULT_PATH) IF(NOT BBTK_BIN_PATH) - MESSAGE(FATAL_ERROR "bbi not found in ${BBTK_DIR}/bin ; ${BBTK_DIR}/Release ; ${BBTK_DIR}/Debug : is bbtk properly built ?") + MESSAGE(FATAL_ERROR "bbi not found in ${BBTK_DIR}/bin ; ${BBTK_DIR}/Release ; ${BBTK_DIR}/Debug ; ${BBTK_DIR}/RelWithDebInfo : is bbtk properly built ?") ENDIF(NOT BBTK_BIN_PATH) - - SET(BBTK_PACKAGE_LIB_PATH bin) + +## 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(BBTK_BBI "${BBTK_BIN_PATH}/bbi") SET(BBTK_BBS2CPP "${BBTK_BIN_PATH}/bbs2cpp") SET(BBTK_BBC "${BBTK_BIN_PATH}/bbc") @@ -23,7 +27,6 @@ ELSE(WIN32) # SET (EXECUTABLE_OUTPUT_REL_PATH bin) # SET (LIBRARY_OUTPUT_REL_PATH bin) SET(BBTK_BIN_PATH ${BBTK_INSTALL_PREFIX}/bin) - SET(BBTK_PACKAGE_LIB_PATH ${BBTK_INSTALL_PREFIX}/lib) SET(BBTK_BBI "${BBTK_BIN_PATH}/bbi") SET(BBTK_BBS2CPP "${BBTK_BIN_PATH}/bbs2cpp") SET(BBTK_BBC "${BBTK_BIN_PATH}/bbc")