X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fcmake%2FBBTKConfigurePackage.cmake;h=f9451b89e7b82c14a6d3d8b08b0958aae77872f8;hb=fe455ba4df3ec334ad809d82a51f261f1edcd343;hp=2cea2fc52b3cb14cfb78afc79bff0e2a9f1f2dd1;hpb=57a2a3a3ab4669eda75ee20ef040884d9a54fdac;p=bbtk.git diff --git a/kernel/cmake/BBTKConfigurePackage.cmake b/kernel/cmake/BBTKConfigurePackage.cmake index 2cea2fc..f9451b8 100644 --- a/kernel/cmake/BBTKConfigurePackage.cmake +++ b/kernel/cmake/BBTKConfigurePackage.cmake @@ -40,12 +40,25 @@ ENDIF(UNIX) IF(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}) #--------------------------------------------------------------------------- + + #---------------------------------------------------------------------------- + # VARS CONFIGURED IN bbPackage.h AND IN doc/bbdoc/header.html.in + 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}\"") + #---------------------------------------------------------------------------- + + #--------------------------------------------------------------------------- # If package deps not in global deps : add them IF(NOT ${BBTK_PACKAGE_NAME}_IN_DEPS) SET(BBTK_PACKAGES_DEPS "${${BBTK_PACKAGE_NAME}_DEPS};${BBTK_PACKAGES_DEPS}" CACHE INTERNAL "bbtk packages dependencies" FORCE) -MESSAGE(STATUS "deps=${BBTK_PACKAGES_DEPS}") + # MESSAGE(STATUS "Packages=${BBTK_PACKAGES_DEPS}") ENDIF(NOT ${BBTK_PACKAGE_NAME}_IN_DEPS) #--------------------------------------------------------------------------- @@ -119,14 +132,16 @@ ELSE(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}) #------------------------------------------------------------------------- #----------------------------------------------------------------------- - # If package deps in global deps : remove them + # If package deps in global deps : reset global deps IF(${BBTK_PACKAGE_NAME}_IN_DEPS) - STRING(REPLACE "${${BBTK_PACKAGE_NAME}_DEPS};" - "" TEMP - ${BBTK_PACKAGES_DEPS}) - - SET(BBTK_PACKAGES_DEPS ${TEMP} - CACHE INTERNAL "bbtk packages dependencies" FORCE) + SET(BBTK_PACKAGES_DEPS "" CACHE INTERNAL + "bbtk packages dependencies" FORCE) +# STRING(REPLACE "${${BBTK_PACKAGE_NAME}_DEPS};" +# "" TEMP +# ${BBTK_PACKAGES_DEPS}) +# +# SET(BBTK_PACKAGES_DEPS ${TEMP} +# CACHE INTERNAL "bbtk packages dependencies" FORCE) ENDIF(${BBTK_PACKAGE_NAME}_IN_DEPS) #-----------------------------------------------------------------------