X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=AdditionalcreaConfig.cmake.in;h=07bae21efbd4aab459a94d9b728457659cdf1ca7;hb=5ac24917793fd1eb8fa032b76de92a769a36b7e7;hp=9c91b5cf5591de64b6edba84c3235cb27dc94664;hpb=8420c208c3966b1c272a54e16951bcb419429f41;p=crea.git

diff --git a/AdditionalcreaConfig.cmake.in b/AdditionalcreaConfig.cmake.in
index 9c91b5c..07bae21 100644
--- a/AdditionalcreaConfig.cmake.in
+++ b/AdditionalcreaConfig.cmake.in
@@ -1,4 +1,6 @@
 #-----------------------------------------------------------------------------
+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 +12,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,8 +22,25 @@ IF(CREA_VERBOSE_CMAKE)
 ENDIF(CREA_VERBOSE_CMAKE)
 #-----------------------------------------------------------------------------
 
-# If crea 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 
+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)
+
+