X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fcmake%2FBBTKCreatePackageBBdoc.cmake;h=47f7aadd67dc083ebd9968099063c87d1ef2edfd;hb=73bf98ea58ec396ec307852f8345236d12d77e19;hp=370281d6bacccd499135a39038042b0c300b96b6;hpb=fc6d759c87715cabfc3d266463f0c89fa3040921;p=bbtk.git diff --git a/kernel/cmake/BBTKCreatePackageBBdoc.cmake b/kernel/cmake/BBTKCreatePackageBBdoc.cmake index 370281d..47f7aad 100644 --- a/kernel/cmake/BBTKCreatePackageBBdoc.cmake +++ b/kernel/cmake/BBTKCreatePackageBBdoc.cmake @@ -30,26 +30,23 @@ MACRO(BBTK_CREATE_PACKAGE_BBDOC PACKAGE_NAME) # IF(WIN32) - - FIND_PATH(DOT_DIR dot.exe PATHS $ENV{PATH} ) - IF(NOT DOT_DIR) - MESSAGE(FATAL_ERROR "DOT NOT FOUND") - ENDIF(NOT DOT_DIR) - # %DOT_DIR% - set(command00 Path=%WXWIN%/lib/vc_dll/__RR__%VTK_DIR%__RR__%ITK_DIR%/../../bin/__RR__${DOT_DIR}__RR__%PATH% ) - STRING(REPLACE "__RR__" "\;" command0 ${command00} ) - - FILE(TO_NATIVE_PATH ${EXECUTABLE_OUTPUT_PATH}/bb${BBTK_PACKAGE_NAME}.dll pathCommand2 ) - set(command1 cd "${EXECUTABLE_OUTPUT_PATH}/../bbs/") - set(command2 copy ${pathCommand2} . ) + SET(USE_DOT TRUE) + MAKE_DLL_PATH() +# FILE(TO_NATIVE_PATH ${EXECUTABLE_OUTPUT_PATH}/bb${BBTK_PACKAGE_NAME}.dll pathCommand2 ) + FILE(TO_NATIVE_PATH ${BBTK_BIN_PATH}/bbtk_config.xml pathCommand2 ) + FILE(TO_NATIVE_PATH ${PROJECT_BINARY_DIR}/${BBTK_BBS_REL_PATH} pathCommand1 ) + set(command1 cd ${pathCommand1}) + set(command2 copy ${pathCommand2} . ) set(command3 ${BBTK_BBI} -N -q ${OUTPUT_FILE}) - set(command4 del bb${BBTK_PACKAGE_NAME}.dll) + set(command4 echo done) + #del bb${BBTK_PACKAGE_NAME}.dll) ADD_CUSTOM_COMMAND( OUTPUT ${DOC_OUTPUT} COMMAND # cd ${BBTK_BIN_PATH}/../bbs/ && ${BBTK_BBI} -n ${OUTPUT_FILE} - set ${command0} && ${command1} && ${command2} && ${command3} && ${command4} + set ${DLL_PATH} && ${command1} && ${command2} && ${command3} + #&& ${command4} DEPENDS bb${PACKAGE_NAME} ) ELSE(WIN32)