From: guigues Date: Tue, 25 Mar 2008 09:08:38 +0000 (+0000) Subject: Bug fix linux X-Git-Tag: r0.6.1~94 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=d033a19d6fc7b26b442a7fadef24b5b83ad600fc;p=bbtk.git Bug fix linux --- diff --git a/kernel/cmake/BBTKCreatePackageBBdoc.cmake b/kernel/cmake/BBTKCreatePackageBBdoc.cmake index d3718df..bd089db 100644 --- a/kernel/cmake/BBTKCreatePackageBBdoc.cmake +++ b/kernel/cmake/BBTKCreatePackageBBdoc.cmake @@ -27,20 +27,29 @@ MACRO(BBTK_CREATE_PACKAGE_BBDOC PACKAGE_NAME) DESTINATION ${BBTK_BBS_INSTALL_PATH}/${BBTK_PACKAGE_NAME}/appli ) - FILE(TO_NATIVE_PATH ${BBTK_BIN_PATH}/bb${BBTK_PACKAGE_NAME}.dll pathCommand2 ) - - set(command1 cd "${BBTK_BIN_PATH}/../bbs/") - set(command2 copy ${pathCommand2} . ) - set(command3 ${BBTK_BBI} -n ${OUTPUT_FILE}) - set(command4 del bb${BBTK_PACKAGE_NAME}.dll) - - ADD_CUSTOM_COMMAND( - OUTPUT ${DOC_OUTPUT} - COMMAND -# cd ${BBTK_BIN_PATH}/../bbs/ && ${BBTK_BBI} -n ${OUTPUT_FILE} + # + IF(WIN32) + FILE(TO_NATIVE_PATH ${BBTK_BIN_PATH}/bb${BBTK_PACKAGE_NAME}.dll pathCommand2 ) + set(command1 cd "${BBTK_BIN_PATH}/../bbs/") + set(command2 copy ${pathCommand2} . ) + set(command3 ${BBTK_BBI} -n ${OUTPUT_FILE}) + set(command4 del bb${BBTK_PACKAGE_NAME}.dll) + + ADD_CUSTOM_COMMAND( + OUTPUT ${DOC_OUTPUT} + COMMAND + # cd ${BBTK_BIN_PATH}/../bbs/ && ${BBTK_BBI} -n ${OUTPUT_FILE} ${command1} && ${command2} && ${command3} && ${command4} - DEPENDS bb${PACKAGE_NAME} - ) + DEPENDS bb${PACKAGE_NAME} + ) + ELSE(WIN32) + ADD_CUSTOM_COMMAND( + OUTPUT ${DOC_OUTPUT} + COMMAND + cd ${BBTK_BIN_PATH} && ${BBTK_BBI} -n ${OUTPUT_FILE} + DEPENDS bb${PACKAGE_NAME} + ) + ENDIF(WIN32) ADD_CUSTOM_TARGET(bbdoc_${PACKAGE_NAME} ALL DEPENDS ${DOC_OUTPUT} )