X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=AdditionalcreaConfig.cmake.in;h=9eca138551c1734ba8cea48c03d1bf38b2550d7e;hb=b5137f0744f50f51113528ad7785d6a3c1543131;hp=3af959d843fd227348800b6b7e37dc79de7cd6fd;hpb=c2bae5bdcb32b42a68b4dd43e3c705a9ff84677e;p=crea.git

diff --git a/AdditionalcreaConfig.cmake.in b/AdditionalcreaConfig.cmake.in
index 3af959d..9eca138 100644
--- a/AdditionalcreaConfig.cmake.in
+++ b/AdditionalcreaConfig.cmake.in
@@ -1,4 +1,8 @@
 #-----------------------------------------------------------------------------
+ADD_DEFINITIONS(-DCREA_BUILD_SHARED)
+SET(CREA_BUILT_WITH_WX @CREA_BUILT_WITH_WX@)
+SET(CREA_BUILT_WITH_WX @CREA_BUILT_WITH_WX@)
+SET(CREA_BUILT_WITH_VTK @CREA_BUILT_WITH_VTK@)
 SET(CREA_CMAKE_REL_PATH @CREA_CMAKE_REL_PATH@)
 SET(CREA_CMAKE_DIR ${crea_DIR}/${CREA_CMAKE_REL_PATH})
 #-----------------------------------------------------------------------------
@@ -10,7 +14,8 @@ SET(CREA_COMPILE_ERROR_MESSAGES @CREA_COMPILE_ERROR_MESSAGES@)
 
 #-----------------------------------------------------------------------------
 IF(CREA_VERBOSE_CMAKE)
-#  MESSAGE(STATUS "* CREA_BUILT_WITH_WX            = ${CREA_BUILT_WITH_WX}")
+  MESSAGE(STATUS "* CREA_BUILT_WITH_WX            = ${CREA_BUILT_WITH_WX}")
+  MESSAGE(STATUS "* CREA_BUILT_WITH_VTK           = ${CREA_BUILT_WITH_VTK}")
   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}")
@@ -19,45 +24,25 @@ IF(CREA_VERBOSE_CMAKE)
 ENDIF(CREA_VERBOSE_CMAKE)
 #-----------------------------------------------------------------------------
 
-# 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)
-#-----------------------------------------------------------------------------
+# If crea was compiled with WxWidget or vtk then have to find them
+#IF(CREA_BUILT_WITH_WX OR CREA_BUILT_WITH_VTK)
+#  INCLUDE(${CREA_CMAKE_DIR}/CREAMacro_Define.cmake)
+#ENDIF(CREA_BUILT_WITH_WX OR CREA_BUILT_WITH_VTK)
+#IF(CREA_BUILT_WITH_WX)
+#  IF(NOT wxWidgets_FOUND)
+#    MESSAGE(STATUS "=======================================")
+#    MESSAGE(STATUS "crea was built with wxWidgets: have to find it...")
+#    INCLUDE(${CREA_CMAKE_DIR}/CREAMacro_FindAndUseWxWidgets.cmake)
+#    CREA_FIND_AND_USE_WXWIDGETS()
+#  ENDIF(NOT wxWidgets_FOUND)
+#ENDIF(CREA_BUILT_WITH_WX)
+#IF(CREA_BUILT_WITH_VTK)
+#  IF (NOT VTK_FOUND)
+#    MESSAGE(STATUS "=======================================")
+#    MESSAGE(STATUS "crea was built with VTK: have to find it...")
+#    INCLUDE(${CREA_CMAKE_DIR}/CREAMacro_FindAndUseVTK.cmake)
+#    CREA_FIND_AND_USE_VTK()
+#  ENDIF (NOT VTK_FOUND)
+#ENDIF(CREA_BUILT_WITH_VTK)