X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fcmake%2FBBTKConfigurePackage.cmake;h=f92766f9e1d68737bf5dae2f069213d029f132a0;hb=3ed747e056775cb0c05bb7899caec6a0fe8a64a7;hp=92c7d53ee38a86a47e850a5b17ce19bb04b5662a;hpb=ba1cc70dcdd708b3de57e6e41b3263c1baa5ea58;p=bbtk.git

diff --git a/kernel/cmake/BBTKConfigurePackage.cmake b/kernel/cmake/BBTKConfigurePackage.cmake
index 92c7d53..f92766f 100644
--- a/kernel/cmake/BBTKConfigurePackage.cmake
+++ b/kernel/cmake/BBTKConfigurePackage.cmake
@@ -1,4 +1,5 @@
 
+MESSAGE(STATUS "")
 MESSAGE(STATUS "=======================================")
 MESSAGE(STATUS "CONFIGURING BBTK PACKAGE ${BBTK_PACKAGE_NAME}")
 
@@ -6,9 +7,13 @@ MESSAGE(STATUS "CONFIGURING BBTK PACKAGE ${BBTK_PACKAGE_NAME}")
 SET(${BBTK_PACKAGE_NAME}_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 #---------------------------------------------------------------------------
 
-
 #---------------------------------------------------------------------------
 IF(NOT BBTK_CORE_PACKAGE)
+  #---------------------------------------------------------------------------
+  SET(BBTK_PACKAGE_LIBS 
+    ${BBTK_PACKAGE_LIBS}
+    ${BBTK_LIBRARIES})
+  MARK_AS_ADVANCED(BBTK_DIR)
   #-------------------------------------------------------------------------
   # If not a core package must include necessary cmake scripts
   INCLUDE(${BBTK_CMAKE_DIR}/BBTKConfigurePackagePaths.cmake)
@@ -34,7 +39,7 @@ IF(NOT BBTK_CORE_PACKAGE)
     )
   IF (WIN32)
     INSTALL ( FILES ${${BBTK_PACKAGE_NAME}_BINARY_DIR}/bbtkPackage
-      DESTINATION "" )
+      DESTINATION "." )
   ENDIF (WIN32)
   #---------------------------------------------------------------------------
 ELSE(NOT BBTK_CORE_PACKAGE)
@@ -90,7 +95,7 @@ IF(${BBTK_PACKAGE_NAME}_USE_VTK)
   SET(USE_VTK ON CACHE BOOL "Use VTK" FORCE)
   SET(${BBTK_PACKAGE_NAME}_LIBS
     ${${BBTK_PACKAGE_NAME}_LIBS}
-    ${BBTK_VTK_LIBRARIES}
+    ${VTK_LIBRARIES}
     )
 ENDIF(${BBTK_PACKAGE_NAME}_USE_VTK)
 
@@ -98,15 +103,24 @@ IF(${BBTK_PACKAGE_NAME}_USE_ITK)
   SET(USE_ITK ON CACHE BOOL "Use ITK" FORCE)
   SET(${BBTK_PACKAGE_NAME}_LIBS
     ${${BBTK_PACKAGE_NAME}_LIBS}
-    ${BBTK_ITK_LIBRARIES}
+    ${ITK_LIBRARIES}
     )
 ENDIF(${BBTK_PACKAGE_NAME}_USE_ITK)
 
+IF(${BBTK_PACKAGE_NAME}_USE_QT)
+  SET(USE_QT4 ON CACHE BOOL "Use QT" FORCE)
+  SET(${BBTK_PACKAGE_NAME}_LIBS
+    ${${BBTK_PACKAGE_NAME}_LIBS}
+    ${QT_LIBRARIES}
+    )
+ENDIF(${BBTK_PACKAGE_NAME}_USE_QT)
+
 IF(${BBTK_PACKAGE_NAME}_USE_GDCM)
   SET(USE_GDCM ON CACHE BOOL "Use GDCM" FORCE)
+  SET(USE_GDCM_VTK ON CACHE BOOL "Use GDCM_VTK" FORCE)
   SET(${BBTK_PACKAGE_NAME}_LIBS
     ${${BBTK_PACKAGE_NAME}_LIBS}
-    ${BBTK_GDCM_LIBRARIES}
+    ${GDCM_LIBRARIES}
     )
 ENDIF(${BBTK_PACKAGE_NAME}_USE_GDCM)
 
@@ -114,7 +128,7 @@ IF(${BBTK_PACKAGE_NAME}_USE_GSMIS)
   SET(USE_GSMIS ON CACHE BOOL "Use GSMIS" FORCE)
   SET(${BBTK_PACKAGE_NAME}_LIBS
     ${${BBTK_PACKAGE_NAME}_LIBS}
-    ${BBTK_GSMIS_LIBRARIES}
+    ${GSMIS_LIBRARIES}
     )
 ENDIF(${BBTK_PACKAGE_NAME}_USE_GSMIS)
 
@@ -126,7 +140,7 @@ IF(${BBTK_PACKAGE_NAME}_USE_WXWIDGETS)
     IF(WIN32)
       SET(${BBTK_PACKAGE_NAME}_LIBS
         ${${BBTK_PACKAGE_NAME}_LIBS}
-        ${BBTK_WXWIDGETS_LIBRARIES}
+        ${WXWIDGETS_LIBRARIES}
         )
     ENDIF(WIN32)
   ELSE(BBTK_CORE_PACKAGE)
@@ -139,7 +153,7 @@ IF(${BBTK_PACKAGE_NAME}_USE_WXWIDGETS)
       IF(WIN32)
         SET(${BBTK_PACKAGE_NAME}_LIBS
           ${${BBTK_PACKAGE_NAME}_LIBS}
-          ${BBTK_WXWIDGETS_LIBRARIES}
+          ${WXWIDGETS_LIBRARIES}
           )
       ENDIF(WIN32)
     ENDIF(NOT BBTK_BUILT_WITH_WX)
@@ -149,7 +163,12 @@ ENDIF(${BBTK_PACKAGE_NAME}_USE_WXWIDGETS)
 
 #---------------------------------------------------------------------------
 
-
+MESSAGE(STATUS "")
+MESSAGE(STATUS "=======================================")
+MESSAGE(STATUS "${BBTK_PACKAGE_NAME} link libraries:")
+MESSAGE(STATUS "${${BBTK_PACKAGE_NAME}_LIBS}")
+MESSAGE(STATUS "=======================================")
+MESSAGE(STATUS "")
 
 #---------------------------------------------------------------------------
 # Recurse into subdirs
@@ -159,6 +178,8 @@ SUBDIRS(bbs)
 SUBDIRS(data)
 #---------------------------------------------------------------------------
 
+MESSAGE(STATUS "=======================================")
+MESSAGE(STATUS "")
 
 #-----------------------------------------------------------------------------
 # EOF