X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fcmake%2FBBTKConfigurePackage.cmake;h=2cea2fc52b3cb14cfb78afc79bff0e2a9f1f2dd1;hb=acec0f7b93efd8318c826ff6b006fde051993c5a;hp=f73f42e24ffa997b429ec50a8c2bedcaf48f5974;hpb=b284bae4a4e8e20c766b348f01bb4b5d5bead96f;p=bbtk.git

diff --git a/kernel/cmake/BBTKConfigurePackage.cmake b/kernel/cmake/BBTKConfigurePackage.cmake
index f73f42e..2cea2fc 100644
--- a/kernel/cmake/BBTKConfigurePackage.cmake
+++ b/kernel/cmake/BBTKConfigurePackage.cmake
@@ -13,6 +13,11 @@ IF(NOT BBTK_CORE_PACKAGE)
 ENDIF(NOT BBTK_CORE_PACKAGE)
 #---------------------------------------------------------------------------
 
+
+#-----------------------------------------------------------------------------
+SET(${BBTK_PACKAGE_NAME}_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+#-----------------------------------------------------------------------------
+
 #-----------------------------------------------------------------------------
 # DOES THE USER WANT TO BUILD THE PACKAGE ?
 OPTION(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME} 
@@ -28,6 +33,7 @@ STRING(REGEX MATCH "${${BBTK_PACKAGE_NAME}_DEPS}"
   "${BBTK_PACKAGES_DEPS}")
 ENDIF(UNIX)
 #-----------------------------------------------------------------------------
+#SET(BBTK_PACKAGES_DEPS "" CACHE INTERNAL "bbtk packages dependencies" FORCE)
 
 #-----------------------------------------------------------------------------
 # IF THE USER HAS CHOSEN TO BUILD THE PACKAGE
@@ -39,6 +45,7 @@ IF(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME})
   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}")
   ENDIF(NOT ${BBTK_PACKAGE_NAME}_IN_DEPS)
   #---------------------------------------------------------------------------
 
@@ -46,32 +53,32 @@ IF(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME})
   # Package dependencies
   IF(${BBTK_PACKAGE_NAME}_USE_VTK)
     SET(USE_VTK ON CACHE BOOL "Use VTK" FORCE)
-    SET(BBTK_PACKAGE_LIBS
-      ${BBTK_PACKAGE_LIBS}
+    SET(${BBTK_PACKAGE_NAME}_LIBS
+      ${${BBTK_PACKAGE_NAME}_LIBS}
       ${BBTK_VTK_LIBRARIES}
       )
   ENDIF(${BBTK_PACKAGE_NAME}_USE_VTK)
   
   IF(${BBTK_PACKAGE_NAME}_USE_ITK)
     SET(USE_ITK ON CACHE BOOL "Use ITK" FORCE)
-    SET(BBTK_PACKAGE_LIBS
-      ${BBTK_PACKAGE_LIBS}
+    SET(${BBTK_PACKAGE_NAME}_LIBS
+      ${${BBTK_PACKAGE_NAME}_LIBS}
       ${BBTK_ITK_LIBRARIES}
       )
   ENDIF(${BBTK_PACKAGE_NAME}_USE_ITK)
   
   IF(${BBTK_PACKAGE_NAME}_USE_GDCM)
     SET(USE_GDCM ON CACHE BOOL "Use GDCM" FORCE)
-    SET(BBTK_PACKAGE_LIBS
-      ${BBTK_PACKAGE_LIBS}
+    SET(${BBTK_PACKAGE_NAME}_LIBS
+      ${${BBTK_PACKAGE_NAME}_LIBS}
       ${BBTK_GDCM_LIBRARIES}
       )
   ENDIF(${BBTK_PACKAGE_NAME}_USE_GDCM)
   
   IF(${BBTK_PACKAGE_NAME}_USE_GSMIS)
     SET(USE_GSMIS ON CACHE BOOL "Use GSMIS" FORCE)
-    SET(BBTK_PACKAGE_LIBS
-      ${BBTK_PACKAGE_LIBS}
+    SET(${BBTK_PACKAGE_NAME}_LIBS
+      ${${BBTK_PACKAGE_NAME}_LIBS}
       ${BBTK_GSMIS_LIBRARIES}
       )
   ENDIF(${BBTK_PACKAGE_NAME}_USE_GSMIS)
@@ -81,8 +88,8 @@ IF(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME})
       SET(BBTK_USE_WXWIDGETS ON CACHE BOOL "Use wxWidgets" FORCE)
       MESSAGE(STATUS "BBTK_USE_WXWIDGETS forced to ON by the compilation of the package ${BBTK_PACKAGE_NAME}")
       # bbtk already links against wx ...
-      #    SET(BBTK_PACKAGE_LIBS
-      #      ${BBTK_PACKAGE_LIBS}
+      #    SET(${BBTK_PACKAGE_NAME}_LIBS
+      #      ${${BBTK_PACKAGE_NAME}_LIBS}
       #      ${BBTK_WXWIDGETS_LIBRARIES}
       #      )
     ELSE(BBTK_CORE_PACKAGE)
@@ -98,20 +105,6 @@ IF(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME})
 
   #---------------------------------------------------------------------------
 
-  #----------------------------------------------------------------------------
-  # 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_VERSION 
-    "${BBTK_PACKAGE_MAJOR_VERSION}.${BBTK_PACKAGE_MINOR_VERSION}.${BBTK_PACKAGE_BUILD_VERSION}")
-  #ADD_DEFINITIONS( -D${BBTK_PACKAGE_NAME}_VERSION=${BBTK_PACKAGE_VERSION})
-  #----------------------------------------------------------------------------
   
   
   #---------------------------------------------------------------------------
@@ -136,7 +129,13 @@ ELSE(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME})
       CACHE INTERNAL "bbtk packages dependencies" FORCE)
   ENDIF(${BBTK_PACKAGE_NAME}_IN_DEPS)
   #-----------------------------------------------------------------------
-  
+
+  #-----------------------------------------------------------------------
+  # Remove the package include scripts to avoid loading it by include * 
+  FILE(REMOVE ${BBTK_BBS_BUILD_PATH}/${BBTK_PACKAGE_NAME}.bbs)
+  FILE(REMOVE ${BBTK_BBS_BUILD_PATH}/${BBTK_PACKAGE_NAME}-appli.bbs)
+   #-----------------------------------------------------------------------
+ 
 
 #---------------------------------------------------------------------------
 ENDIF(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME})