X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fcmake%2FBBTKConfigurePackagePaths.cmake;h=f45b308b54f8a704f7af60bafe8cc14eacec0fdd;hb=1688b52778caa9985ecea38aad38341817e0401a;hp=1cbcc9866390f0c5679ab84dd8743c247e533f0d;hpb=ec8cc0691e3b2b5439e6a320ad26648600412efc;p=bbtk.git diff --git a/kernel/cmake/BBTKConfigurePackagePaths.cmake b/kernel/cmake/BBTKConfigurePackagePaths.cmake index 1cbcc98..f45b308 100644 --- a/kernel/cmake/BBTKConfigurePackagePaths.cmake +++ b/kernel/cmake/BBTKConfigurePackagePaths.cmake @@ -1,5 +1,6 @@ +SET(BBTK_PACKAGE_LIB_PATH ${CMAKE_CREA_LIB_PATH} ) IF(WIN32) SET (EXECUTABLE_OUTPUT_REL_PATH "") @@ -14,9 +15,8 @@ IF(WIN32) 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 (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") @@ -27,8 +27,6 @@ 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")