X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fcmake%2FBBTKConfigurePackagePaths.cmake;h=2ddfee14c94986b9c3bebf20e70e8658a6ed930a;hb=3ed747e056775cb0c05bb7899caec6a0fe8a64a7;hp=2a87606da23995fec3729497d0c875b432221561;hpb=865c4a8acc43605c07d519a1d029d5361deeff54;p=bbtk.git diff --git a/kernel/cmake/BBTKConfigurePackagePaths.cmake b/kernel/cmake/BBTKConfigurePackagePaths.cmake index 2a87606..2ddfee1 100644 --- a/kernel/cmake/BBTKConfigurePackagePaths.cmake +++ b/kernel/cmake/BBTKConfigurePackagePaths.cmake @@ -1,4 +1,6 @@ + + IF(WIN32) SET (EXECUTABLE_OUTPUT_REL_PATH "") SET (LIBRARY_OUTPUT_REL_PATH "") @@ -6,13 +8,15 @@ 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 (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_PACKAGE_LIB_PATH bin) SET(BBTK_BBI "${BBTK_BIN_PATH}/bbi") SET(BBTK_BBS2CPP "${BBTK_BIN_PATH}/bbs2cpp") SET(BBTK_BBC "${BBTK_BIN_PATH}/bbc") @@ -23,6 +27,8 @@ ELSE(WIN32) # SET (EXECUTABLE_OUTPUT_REL_PATH bin) # SET (LIBRARY_OUTPUT_REL_PATH bin) SET(BBTK_BIN_PATH ${BBTK_INSTALL_PREFIX}/bin) +#EED SET(BBTK_PACKAGE_LIB_PATH ${BBTK_INSTALL_PREFIX}/lib) + SET(BBTK_PACKAGE_LIB_PATH lib) SET(BBTK_BBI "${BBTK_BIN_PATH}/bbi") SET(BBTK_BBS2CPP "${BBTK_BIN_PATH}/bbs2cpp") SET(BBTK_BBC "${BBTK_BIN_PATH}/bbc")