*** empty log message ***

[crea.git] / cmake / CREAMacro_FindAndUseLibraries.cmake

diff --git a/cmake/CREAMacro_FindAndUseLibraries.cmake b/cmake/CREAMacro_FindAndUseLibraries.cmake
index 2e5eedae65b21525636113327186d00899cf5852..a363495e5fa5fe58c2fb71d331ebb1dd8bab897f 100644 (file)
--- a/cmake/CREAMacro_FindAndUseLibraries.cmake
+++ b/cmake/CREAMacro_FindAndUseLibraries.cmake
@@ -10,7 +10,7 @@ ENDIF(USE_VTK)
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
-IF(USE_KW)
+IF(USE_KWWIDGETS)
   IF(NOT KWWidgets_FOUND)
     # Search KWWidgets
     FIND_PACKAGE(KWWidgets)
@@ -20,6 +20,11 @@ IF(USE_KW)
       MESSAGE ( STATUS "Looking for KWWidgets... found")
       MESSAGE ( STATUS "* Dir     = ${KWWidgets_DIR}")
       MESSAGE ( STATUS "* Version = ${KWWidgets_MAJOR_VERSION}.${KWWidgets_MINOR_VERSION}.${KWWidgets_BUILD_VERSION}")
+      IF (USE_VTK)
+         # KWWidgets must not search again for vtk !
+        SET(KWWidgets_NO_USE_VTK ON)
+      ENDIF (USE_VTK)
+
       INCLUDE(${KWWidgets_USE_FILE})
       CREA_DEFINE( USE_KWWIDGETS )
       SET(KWWIDGETS_LIBRARIES
@@ -30,7 +35,7 @@ IF(USE_KW)
       message(FATAL_ERROR "KWWidgets_DIR not found")
     ENDIF(KWWidgets_FOUND)
   ENDIF(NOT KWWidgets_FOUND)
-ENDIF(USE_KW)
+ENDIF(USE_KWWIDGETS)
 #-----------------------------------------------------------------------------
 
 
@@ -48,6 +53,7 @@ IF(USE_ITK)
       MESSAGE ( STATUS "* Version = ${ITK_VERSION_MAJOR}.${ITK_VERSION_MINOR}.${ITK_VERSION_PATCH}")
       INCLUDE(${ITK_USE_FILE})
       CREA_DEFINE( USE_ITK )
+      CREA_DEFINE( _USE_ITK_ )
       SET(ITK_LIBRARIES
        ITKCommon ITKIO ITKBasicFilters ITKAlgorithms
        )