From 57a2a3a3ab4669eda75ee20ef040884d9a54fdac Mon Sep 17 00:00:00 2001 From: guigues Date: Fri, 8 Feb 2008 11:56:10 +0000 Subject: [PATCH] *** empty log message *** --- kernel/cmake/BBTKConfigurePackage.cmake | 14 ---------- .../BBTKConfigurePackage_doc_bbdoc.cmake | 8 ++++-- kernel/cmake/BBTKConfigurePackage_src.cmake | 18 +++++++++---- kernel/cmake/BBTKCreatePackageBBdoc.cmake | 27 ++++++++----------- .../BBTKCreatePackageIncludeScript.cmake | 10 ++++--- kernel/cmake/BBTKSetDeducedPaths.cmake | 27 ++++++++++--------- kernel/cmake/bbPackage.cxx.in | 6 ++--- kernel/src/bbtkComplexBlackBoxDescriptor.cxx | 9 ++++--- 8 files changed, 58 insertions(+), 61 deletions(-) diff --git a/kernel/cmake/BBTKConfigurePackage.cmake b/kernel/cmake/BBTKConfigurePackage.cmake index 7d4c3b7..2cea2fc 100644 --- a/kernel/cmake/BBTKConfigurePackage.cmake +++ b/kernel/cmake/BBTKConfigurePackage.cmake @@ -105,20 +105,6 @@ MESSAGE(STATUS "deps=${BBTK_PACKAGES_DEPS}") #--------------------------------------------------------------------------- - #---------------------------------------------------------------------------- - # DEFINES ${PACKAGE_NAME}_AUTHOR - # ADD_DEFINITIONS( -D${PACKAGE_NAME}_AUTHOR="${PACKAGE_AUTHOR}") - #---------------------------------------------------------------------------- - #---------------------------------------------------------------------------- - # DEFINES ${PACKAGE_NAME}_DESCRIPTION - # ADD_DEFINITIONS( -D${PACKAGE_NAME}_DESCRIPTION="${PACKAGE_DESCRIPTION}") - #---------------------------------------------------------------------------- - #---------------------------------------------------------------------------- - # DEFINES ${BBTK_PACKAGE_NAME}_VERSION - SET(${BBTK_PACKAGE_NAME}_VERSION - "${${BBTK_PACKAGE_NAME}_MAJOR_VERSION}.${${BBTK_PACKAGE_NAME}_MINOR_VERSION}.${${BBTK_PACKAGE_NAME}_BUILD_VERSION}") - #ADD_DEFINITIONS( -D${${BBTK_PACKAGE_NAME}_NAME}_VERSION=${${BBTK_PACKAGE_NAME}_VERSION}) - #---------------------------------------------------------------------------- #--------------------------------------------------------------------------- diff --git a/kernel/cmake/BBTKConfigurePackage_doc_bbdoc.cmake b/kernel/cmake/BBTKConfigurePackage_doc_bbdoc.cmake index f48e1d0..665668b 100644 --- a/kernel/cmake/BBTKConfigurePackage_doc_bbdoc.cmake +++ b/kernel/cmake/BBTKConfigurePackage_doc_bbdoc.cmake @@ -1,7 +1,11 @@ CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/header.html.in - ${CMAKE_CURRENT_BINARY_DIR}/header.html - ) + ${CMAKE_CURRENT_BINARY_DIR}/header.html + ) +INSTALL( + FILES ${CMAKE_CURRENT_BINARY_DIR}/header.html + DESTINATION ${BBTK_BBDOC_INSTALL_PATH}/${PACKAGE_NAME} + ) INCLUDE(${BBTK_CMAKE_DIR}/BBTKCreatePackageBBdoc.cmake) diff --git a/kernel/cmake/BBTKConfigurePackage_src.cmake b/kernel/cmake/BBTKConfigurePackage_src.cmake index 2fcd9de..967fbde 100644 --- a/kernel/cmake/BBTKConfigurePackage_src.cmake +++ b/kernel/cmake/BBTKConfigurePackage_src.cmake @@ -14,6 +14,19 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ) INCLUDE_DIRECTORIES(../${${BBTK_PACKAGE_NAME}_INCLUDE_DIRS}) #---------------------------------------------------------------------------- +#---------------------------------------------------------------------------- +# VARS CONFIGURED IN bbPackage.h +SET(BBTK_PACKAGE_AUTHOR "\"${${BBTK_PACKAGE_NAME}_AUTHOR}\"") +SET(BBTK_PACKAGE_DESCRIPTION "\"${${BBTK_PACKAGE_NAME}_DESCRIPTION}\"") +SET(BBTK_PACKAGE_MAJOR_VERSION ${${BBTK_PACKAGE_NAME}_MAJOR_VERSION}) +SET(BBTK_PACKAGE_MINOR_VERSION ${${BBTK_PACKAGE_NAME}_MINOR_VERSION}) +SET(BBTK_PACKAGE_BUILD_VERSION ${${BBTK_PACKAGE_NAME}_BUILD_VERSION}) +SET(BBTK_PACKAGE_VERSION + "\"${${BBTK_PACKAGE_NAME}_MAJOR_VERSION}.${${BBTK_PACKAGE_NAME}_MINOR_VERSION}.${${BBTK_PACKAGE_NAME}_BUILD_VERSION}\"") +#---------------------------------------------------------------------------- + +#---------------------------------------------------------------------------- + #---------------------------------------------------------------------------- # CREATES bb${BBTK_PACKAGE_NAME}Package.h CONFIGURE_FILE( @@ -167,11 +180,6 @@ SET(BBTK_PACKAGE_USE_GDCM ${${BBTK_PACKAGE_NAME}_USE_GDCM}) SET(BBTK_PACKAGE_USE_GSMIS ${${BBTK_PACKAGE_NAME}_USE_GSMIS}) SET(BBTK_PACKAGE_USE_WXWIDGETS ${${BBTK_PACKAGE_NAME}_USE_WXWIDGETS}) SET(BBTK_PACKAGE_USE_PACKAGES ${${BBTK_PACKAGE_NAME}_USE_PACKAGES}) -SET(BBTK_PACKAGE_AUTHOR "\"${${BBTK_PACKAGE_NAME}_AUTHOR}\"") -SET(BBTK_PACKAGE_DESCRIPTION "\"${${BBTK_PACKAGE_NAME}_DESCRIPTION}\"") -SET(BBTK_PACKAGE_MAJOR_VERSION ${${BBTK_PACKAGE_NAME}_MAJOR_VERSION}) -SET(BBTK_PACKAGE_MINOR_VERSION ${${BBTK_PACKAGE_NAME}_MINOR_VERSION}) -SET(BBTK_PACKAGE_BUILD_VERSION ${${BBTK_PACKAGE_NAME}_BUILD_VERSION}) SET(BBTK_PACKAGE_INCLUDE_DIRS ${${BBTK_PACKAGE_NAME}_INCLUDE_DIRS}) SET(BBTK_PACKAGE_LIBS ${${BBTK_PACKAGE_NAME}_LIBS}) diff --git a/kernel/cmake/BBTKCreatePackageBBdoc.cmake b/kernel/cmake/BBTKCreatePackageBBdoc.cmake index 7927988..a163dc7 100644 --- a/kernel/cmake/BBTKCreatePackageBBdoc.cmake +++ b/kernel/cmake/BBTKCreatePackageBBdoc.cmake @@ -19,18 +19,12 @@ MACRO(BBTK_CREATE_PACKAGE_BBDOC PACKAGE_NAME) "include ${PACKAGE_NAME}-appli\n" "#-----------------------------------------\n" "graph ${PACKAGE_NAME} 0 0 ${DOC_OUTPUT} \"${CMAKE_CURRENT_BINARY_DIR}/header.html\" \"Package ${PACKAGE_NAME} documentation\"\n" -#${BBTK_DOCUMENT_SCRIPTS_OUTPUT_PATH}/header.html ) -# CONFIGURE_FILE( -# ${OUTPUT_FILE} -# ${BBTK_BBS_BUILD_PATH}/${BBTK_PACKAGE_NAME}/appli/make_doc_${PACKAGE_NAME}.bbs -# COPYONLY -# ) -# INSTALL( -# FILES ${OUTPUT_FILE} -# DESTINATION ${BBTK_BBS_INSTALL_PATH}/${BBTK_PACKAGE_NAME}/appli -# ) - + INSTALL( + FILES ${OUTPUT_FILE} + DESTINATION ${BBTK_BBS_INSTALL_PATH}/${BBTK_PACKAGE_NAME}/appli + ) + ADD_CUSTOM_COMMAND( OUTPUT ${DOC_OUTPUT} COMMAND @@ -40,12 +34,13 @@ MACRO(BBTK_CREATE_PACKAGE_BBDOC PACKAGE_NAME) ADD_CUSTOM_TARGET(bbdoc_${PACKAGE_NAME} ALL DEPENDS ${DOC_OUTPUT} ) - # Install -# INSTALL( -# FILES ${CMAKE_CURRENT_BINARY_DIR}/${TEX_FILE}.html -# DESTINATION ${CMAKE_INSTALL_PREFIX}/${BBTK_DOC_INSTALL_PATH}/${TEX_FILE} -# ) + INSTALL( + DIRECTORY ${BBTK_BBDOC_BUILD_PATH}/${PACKAGE_NAME} + DESTINATION ${BBTK_BBDOC_INSTALL_PATH} + ) + + ENDMACRO(BBTK_CREATE_PACKAGE_BBDOC NAME) diff --git a/kernel/cmake/BBTKCreatePackageIncludeScript.cmake b/kernel/cmake/BBTKCreatePackageIncludeScript.cmake index 383583f..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) @@ -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 diff --git a/kernel/cmake/BBTKSetDeducedPaths.cmake b/kernel/cmake/BBTKSetDeducedPaths.cmake index c314293..56d5e08 100644 --- a/kernel/cmake/BBTKSetDeducedPaths.cmake +++ b/kernel/cmake/BBTKSetDeducedPaths.cmake @@ -37,18 +37,19 @@ SET(CMakeCreateFindPackage_DIR ${BBTK_CMAKE_DIR}) #----------------------------------------------------------------------------- # Dependencies added only the first time ! -IF(EXISTS ${BBTK_BBI}) - SET(BBTK_BBI_DEPENDENCY) -ELSE(EXISTS ${BBTK_BBI}) - SET(BBTK_BBI_DEPENDENCY ${BBTK_BBI}) -ENDIF(EXISTS ${BBTK_BBI}) - - -IF(EXISTS ${BBTK_BBFY}) - SET(BBTK_BBFY_DEPENDENCY) -ELSE(EXISTS ${BBTK_BBFY}) - SET(BBTK_BBFY_DEPENDENCY ${BBTK_BBFY}) -ENDIF(EXISTS ${BBTK_BBFY}) - +IF(BBTK_CORE_PACKAGE) + IF(EXISTS ${BBTK_BBI}) + SET(BBTK_BBI_DEPENDENCY) + ELSE(EXISTS ${BBTK_BBI}) + SET(BBTK_BBI_DEPENDENCY ${BBTK_BBI}) + ENDIF(EXISTS ${BBTK_BBI}) + + + IF(EXISTS ${BBTK_BBFY}) + SET(BBTK_BBFY_DEPENDENCY) + ELSE(EXISTS ${BBTK_BBFY}) + SET(BBTK_BBFY_DEPENDENCY ${BBTK_BBFY}) + ENDIF(EXISTS ${BBTK_BBFY}) +ENDIF(BBTK_CORE_PACKAGE) #----------------------------------------------------------------------------- diff --git a/kernel/cmake/bbPackage.cxx.in b/kernel/cmake/bbPackage.cxx.in index 21d47fc..e64aaad 100644 --- a/kernel/cmake/bbPackage.cxx.in +++ b/kernel/cmake/bbPackage.cxx.in @@ -1,6 +1,6 @@ #include "bb@BBTK_PACKAGE_NAME@Package.h" BBTK_IMPLEMENT_PACKAGE(@BBTK_PACKAGE_NAME@, - "@BBTK_PACKAGE_AUTHOR@", - "@BBTK_PACKAGE_DESCRIPTION@", - "@BBTK_PACKAGE_VERSION@") + @BBTK_PACKAGE_AUTHOR@, + @BBTK_PACKAGE_DESCRIPTION@, + @BBTK_PACKAGE_VERSION@) diff --git a/kernel/src/bbtkComplexBlackBoxDescriptor.cxx b/kernel/src/bbtkComplexBlackBoxDescriptor.cxx index 1afb3f6..99133da 100644 --- a/kernel/src/bbtkComplexBlackBoxDescriptor.cxx +++ b/kernel/src/bbtkComplexBlackBoxDescriptor.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkComplexBlackBoxDescriptor.cxx,v $ Language: C++ - Date: $Date: 2008/02/08 07:39:49 $ - Version: $Revision: 1.8 $ + Date: $Date: 2008/02/08 11:56:10 $ + Version: $Revision: 1.9 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -311,8 +311,9 @@ namespace bbtk std::string inc = GetScriptFileName(); if (inc.size()>0) { - (s) << " To use it : include " - << inc << "\n"; + s << " To use it : include "; + s << inc << "  [source]"; + s << "\n"; } -- 2.47.1