X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=kernel%2Fcmake%2FBBTKCreatePackageIncludeScript.cmake;h=620c8a06e1c0e0346427b8071a72e16cce97095d;hb=af74e5f8cece8e722e4ab3189222f102efb8a538;hp=df133c086084603159c4d239dd1036d8636d730a;hpb=d744d34233cd2005b3baa27e7fb5962b5764444e;p=bbtk.git diff --git a/kernel/cmake/BBTKCreatePackageIncludeScript.cmake b/kernel/cmake/BBTKCreatePackageIncludeScript.cmake index df133c0..620c8a0 100644 --- a/kernel/cmake/BBTKCreatePackageIncludeScript.cmake +++ b/kernel/cmake/BBTKCreatePackageIncludeScript.cmake @@ -32,11 +32,12 @@ MACRO(BBTK_CREATE_PACKAGE_INCLUDE_SCRIPT BBTK_PACKAGE_NAME BBTK_PACKAGE_BB CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/${bbs} ${BBTK_BBS_BUILD_PATH}/${BBTK_PACKAGE_NAME}/${bbs} - COPYONLY - ) + COPYONLY + ) + GET_FILENAME_COMPONENT(bbs_path ${bbs} PATH) INSTALL( FILES ${CMAKE_CURRENT_SOURCE_DIR}/${bbs} - DESTINATION ${BBTK_BBS_INSTALL_PATH}/${BBTK_PACKAGE_NAME}/${bbs} + DESTINATION ${BBTK_BBS_INSTALL_PATH}/${BBTK_PACKAGE_NAME}/${bbs_path} ) ENDFOREACH(bbs) @@ -71,7 +72,7 @@ MACRO(BBTK_CREATE_PACKAGE_INCLUDE_SCRIPT BBTK_PACKAGE_NAME BBTK_PACKAGE_BB "${OUTPUT_FILE}" "#-----------------------------------------\n" "define ${filename}\n" - "include ${BBTK_PACKAGE_NAME}/${bbs}\n" + "include ${BBTK_PACKAGE_NAME}/${bbs} source\n" "endefine\n" ) CONFIGURE_FILE( @@ -79,9 +80,10 @@ MACRO(BBTK_CREATE_PACKAGE_INCLUDE_SCRIPT BBTK_PACKAGE_NAME BBTK_PACKAGE_BB ${BBTK_BBS_BUILD_PATH}/${BBTK_PACKAGE_NAME}/${bbs} COPYONLY ) + GET_FILENAME_COMPONENT(bbs_path ${bbs} PATH) INSTALL( FILES ${CMAKE_CURRENT_SOURCE_DIR}/${bbs} - DESTINATION ${BBTK_BBS_INSTALL_PATH}/${BBTK_PACKAGE_NAME}/${bbs} + DESTINATION ${BBTK_BBS_INSTALL_PATH}/${BBTK_PACKAGE_NAME}/${bbs_path} ) ENDFOREACH(bbs) FILE(APPEND