bug fixes

[crea.git] / AdditionalcreaConfig.cmake.in

diff --git a/AdditionalcreaConfig.cmake.in b/AdditionalcreaConfig.cmake.in
index 5cfe716bf716a28fa7b3132ccf499dfdb061377e..3af959d843fd227348800b6b7e37dc79de7cd6fd 100644 (file)
--- a/AdditionalcreaConfig.cmake.in
+++ b/AdditionalcreaConfig.cmake.in
@@ -1,26 +1,63 @@
 #-----------------------------------------------------------------------------
-SET(crea_CMAKE_REL_PATH @crea_CMAKE_REL_PATH@)
-SET(crea_CMAKE_DIR ${crea_DIR}/${crea_CMAKE_REL_PATH})
+SET(CREA_CMAKE_REL_PATH @CREA_CMAKE_REL_PATH@)
+SET(CREA_CMAKE_DIR ${crea_DIR}/${CREA_CMAKE_REL_PATH})
 #-----------------------------------------------------------------------------
-SET(crea_COMPILE_MESSAGES @crea_COMPILE_MESSAGES@)
-SET(crea_COMPILE_DEBUG_MESSAGES @crea_COMPILE_DEBUG_MESSAGES@)
-SET(crea_COMPILE_WARNING_MESSAGES @crea_COMPILE_WARNING_MESSAGES@)
-SET(crea_COMPILE_ERROR_MESSAGES @crea_COMPILE_ERROR_MESSAGES@)
+SET(CREA_COMPILE_MESSAGES @CREA_COMPILE_MESSAGES@)
+SET(CREA_COMPILE_DEBUG_MESSAGES @CREA_COMPILE_DEBUG_MESSAGES@)
+SET(CREA_COMPILE_WARNING_MESSAGES @CREA_COMPILE_WARNING_MESSAGES@)
+SET(CREA_COMPILE_ERROR_MESSAGES @CREA_COMPILE_ERROR_MESSAGES@)
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
-IF(crea_VERBOSE_FIND_LIBRARY)
-#  MESSAGE(STATUS "* crea_BUILT_WITH_WX            = ${crea_BUILT_WITH_WX}")
-  MESSAGE(STATUS "* crea_CMAKE_DIR                = ${crea_CMAKE_DIR}")
-  MESSAGE(STATUS "* crea_COMPILE_MESSAGES         = ${crea_COMPILE_MESSAGES}")
-  MESSAGE(STATUS "* crea_COMPILE_WARNING_MESSAGES = ${crea_COMPILE_WARNING_MESSAGES}")
-  MESSAGE(STATUS "* crea_COMPILE_ERROR_MESSAGES   = ${crea_COMPILE_ERROR_MESSAGES}")
-  MESSAGE(STATUS "* crea_COMPILE_DEBUG_MESSAGES   = ${crea_COMPILE_DEBUG_MESSAGES}")
-ENDIF(crea_VERBOSE_FIND_LIBRARY)
+IF(CREA_VERBOSE_CMAKE)
+#  MESSAGE(STATUS "* CREA_BUILT_WITH_WX            = ${CREA_BUILT_WITH_WX}")
+  MESSAGE(STATUS "* CREA_CMAKE_DIR                = ${CREA_CMAKE_DIR}")
+  MESSAGE(STATUS "* CREA_COMPILE_MESSAGES         = ${CREA_COMPILE_MESSAGES}")
+  MESSAGE(STATUS "* CREA_COMPILE_WARNING_MESSAGES = ${CREA_COMPILE_WARNING_MESSAGES}")
+  MESSAGE(STATUS "* CREA_COMPILE_ERROR_MESSAGES   = ${CREA_COMPILE_ERROR_MESSAGES}")
+  MESSAGE(STATUS "* CREA_COMPILE_DEBUG_MESSAGES   = ${CREA_COMPILE_DEBUG_MESSAGES}")
+ENDIF(CREA_VERBOSE_CMAKE)
 #-----------------------------------------------------------------------------
 
-# If bbtk was compiled with WxWidget then have to find it
-#IF(crea_BUILT_WITH_WX)
-#  INCLUDE(${crea_CMAKE_DIR}/creaWxWidgets.cmake)
-#  crea_FIND_WXWIDGETS()
-#ENDIF(crea_BUILT_WITH_WX)
+# If crea was compiled with WxWidget or vtk then have to find them : for now forced (see root CMakeLists.txt)
+SET(USE_WXWIDGETS ON)
+SET(USE_VTK ON)
+
+INCLUDE(${CREA_CMAKE_DIR}/CREAMacros.cmake)
+
+#-----------------------------------------------------------------------------
+IF(USE_VTK)
+  # Search VTK
+  FIND_PACKAGE(VTK)
+  # If vtk found
+  IF(VTK_FOUND)
+    MESSAGE ( STATUS "Looking for VTK... found")
+    MESSAGE ( STATUS "* Dir     = ${VTK_DIR}")
+    MESSAGE ( STATUS "* Version = ${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}.${VTK_BUILD_VERSION}")
+    INCLUDE(${VTK_USE_FILE})
+    CREA_DEFINE( USE_VTK )
+    SET(VTK_LIBRARIES
+      vtkImaging  vtkGraphics vtkRendering vtkFiltering vtkCommon vtkWidgets
+      vtkVolumeRendering
+      # LG : removed vtkIO because conflict with itktiff lib in ITKIO 
+      ) 
+    IF(NOT USE_ITK)
+     SET(VTK_LIBRARIES ${VTK_LIBRARIES} vtkIO)
+    ENDIF(NOT USE_ITK)
+    MARK_AS_ADVANCED(VTK_DIR)
+  ELSE(VTK_FOUND)
+     message(FATAL_ERROR "VTK_DIR not found")
+  ENDIF(VTK_FOUND)
+ENDIF(USE_VTK)
+#-----------------------------------------------------------------------------
+
+
+#-----------------------------------------------------------------------------
+IF(USE_WXWIDGETS)
+  INCLUDE(${CREA_CMAKE_DIR}/CREAMacro_wxWidgets.cmake)
+  CREA_FIND_WXWIDGETS()
+  CREA_USE_WXWIDGETS()
+ENDIF(USE_WXWIDGETS)
+#-----------------------------------------------------------------------------
+
+