X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fcmake%2FBBTKConfigurePackage_bbs.cmake;h=6b55795e646c2dafa91fbce55b3f14a34a168bfd;hb=1688b52778caa9985ecea38aad38341817e0401a;hp=025a901a17eb5b1b85358afe14d4f1dd5a470807;hpb=857e5e5bd003d20cb8bc4539b6fca4ca9d50929c;p=bbtk.git diff --git a/kernel/cmake/BBTKConfigurePackage_bbs.cmake b/kernel/cmake/BBTKConfigurePackage_bbs.cmake index 025a901..6b55795 100644 --- a/kernel/cmake/BBTKConfigurePackage_bbs.cmake +++ b/kernel/cmake/BBTKConfigurePackage_bbs.cmake @@ -1,5 +1,4 @@ - #---------------------------------------------------------------------------- IF(${BBTK_PACKAGE_NAME}_INCLUDE_ALL_BBS_BOXES) FILE(GLOB @@ -37,12 +36,32 @@ BBTK_CREATE_PACKAGE_INCLUDE_SCRIPT( ) #---------------------------------------------------------------------------- + IF(NOT WIN32) + # runs bbRegeneratePackageDoc and bbRegenerateBoxesLists + # as a post install step + # does not work on windaube + IF(NOT BBTK_CORE_PACKAGE) + +##EED 25oct2010 +# INSTALL(CODE +# "EXECUTE_PROCESS(COMMAND echo -- Executing '${BBTK_BIN_PATH}/bbPostInstallPackage ${BBTK_PACKAGE_NAME}')" +# ) +# INSTALL(CODE +# "EXECUTE_PROCESS(COMMAND ${BBTK_BIN_PATH}/bbPostInstallPackage ${BBTK_PACKAGE_NAME})" +# ) +# COMMAND cd ${BBTK_BIN_PATH} COMMAND export LD_LIBRARY_PATH=\"../lib:$ENV{LD_LIBRARY_PATH}\" COMMAND bbRegeneratePackageDoc ${BBTK_PACKAGE_NAME} COMMAND bbRegenerateBoxesLists COMMAND echo \"done\")") + + + ENDIF(NOT BBTK_CORE_PACKAGE) + ENDIF(NOT WIN32) + + #---------------------------------------------------------------------------- #--------------------------------------------------------------------------- IF(BBTK_CORE_PACKAGE) # If a core package set option from bbtk global one IF (BUILD_BBS_APPLI_BINARIES) - SET(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}_BBS_APP ON) + SET(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}_BBS_APP OFF) ELSE (BUILD_BBS_APPLI_BINARIES) SET(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}_BBS_APP OFF) ENDIF (BUILD_BBS_APPLI_BINARIES) @@ -51,7 +70,7 @@ ELSE(BBTK_CORE_PACKAGE) # Create the option OPTION(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}_BBS_APP "Build binaries for bbs applications of package ${BBTK_PACKAGE_NAME} ?" OFF) - SWITCH_ON_IF_BUILD_ALL(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}_BBS_APP) +##EED SWITCH_ON_IF_BUILD_ALL(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}_BBS_APP) ENDIF(BBTK_CORE_PACKAGE) #---------------------------------------------------------------------------