X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fcmake%2FBBTKFindLibraries.cmake;h=6294b257f502fffa388cc36f3e26cc68af5b001a;hb=b5526f674bf6a0271d706bef15e46bf305b1d8a2;hp=5f4346c6877280b3de79510d0bbc3d5703420bb1;hpb=aeafe748c859675cf481bd9e5e5a5afa84a3fa52;p=bbtk.git

diff --git a/kernel/cmake/BBTKFindLibraries.cmake b/kernel/cmake/BBTKFindLibraries.cmake
index 5f4346c..6294b25 100644
--- a/kernel/cmake/BBTKFindLibraries.cmake
+++ b/kernel/cmake/BBTKFindLibraries.cmake
@@ -11,9 +11,12 @@ IF(USE_VTK)
     SET(BBTK_VTK_LIBRARIES
       #     vtkCommon 
       vtkImaging  vtkGraphics vtkRendering vtkFiltering vtkCommon vtkWidgets
+      vtkVolumeRendering
       # LG : removed vtkIO because conflict with itktiff lib in ITKIO 
       ) 
     MARK_AS_ADVANCED(VTK_DIR)
+  ELSE(VTK_FOUND)
+     message(FATAL_ERROR "VTK_DIR not found")
   ENDIF(VTK_FOUND)
 ENDIF(USE_VTK)
 #-----------------------------------------------------------------------------
@@ -89,6 +92,8 @@ IF(USE_ITK)
     IF ( itk_IMAGE_TYPE_DOUBLE ) 
       ADD_DEF( BBTK_ITK_IMAGE_TYPE_double )
     ENDIF ( itk_IMAGE_TYPE_DOUBLE )
+  ELSE(ITK_FOUND)
+     message(FATAL_ERROR "ITK_DIR not found")
   ENDIF(ITK_FOUND)
 ENDIF(USE_ITK)
 #-----------------------------------------------------------------------------
@@ -112,69 +117,10 @@ ENDIF(USE_GDCM)
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
-#OPTION(USE_WXWIDGETS "Build wxWidgets-based black boxes" OFF)
 IF(USE_WXWIDGETS)
-
-IF(WIN32)
-  # Search WXWIDGETS
-
-  #  WXWINDOWS_LIBRARY         = full path to the wxWindows library and linker flags on unix
-  #  CMAKE_WX_CXX_FLAGS        = compiler flags for building wxWindows 
-  #  WXWINDOWS_INCLUDE_PATH    = include path of wxWindows
-  SET(WXWINDOWS_USE_GL 1)
-
-  #wxWidgets build related stuff
-  SET(WXW_USE_DEBUG ON)
-  SET(WXW_USE_UNICODE OFF)
-  SET(WXW_USE_SHARED ON)
-  SET(WXW_USE_UNIV OFF)
-  SET(WXW_USE_MONO OFF)
-  SET(WXW_FILE_VERSION "28")
-  SET(WXW_VERSION "2.8")
-
-  #CMake Options
-  # Why forcing verbosity ?
-  # SET(CMAKE_VERBOSE_MAKEFILE TRUE)
-
-  INCLUDE (${BBTK_DIR}/BBTKFindWX_WIN.cmake)
-  #
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}${WXWIDGETS_CXX_FLAGS}")
-  SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}${WXWIDGETS_EXE_LINKER_FLAGS}")
-  ADD_DEFINITIONS( ${WXWIDGETS_DEFINITIONS}  )
-  #
-  INCLUDE_DIRECTORIES(${WXWIDGETS_INCLUDE_DIR})
-  LINK_DIRECTORIES( ${WXWIDGETS_LINK_DIRECTORIES} )
-  SET(THE_WXWIDGETS_LIBRARIES
-    ${WXWIDGETS_LIBRARIES}     
-    debug msvcrtd
-    debug msvcprtd
-    optimized msvcrt
-    optimized msvcprt
-    )
-ENDIF(WIN32)
-IF(UNIX)
-  # GTK2
-  INCLUDE(${BBTK_DIR}/BBTKFindGTK2.cmake)
-  INCLUDE_DIRECTORIES(${GTK2_INCLUDE_DIRS})
-  LINK_DIRECTORIES(${GTK2_LIBRARY_DIRS})
-  LINK_LIBRARIES(${GTK2_LIBRARIES})
-  # WX
-  # LG : Do not force but use what is installed !
-  # SET(wxWidgets_USE_LIBS base core gl)
-  FIND_PACKAGE( wxWidgets REQUIRED) 
-  INCLUDE( ${wxWidgets_USE_FILE} )
-  MARK_AS_ADVANCED(wxWidgets_CONFIG_EXECUTABLE)
-  SET(THE_WXWIDGETS_LIBRARIES
-    ${GTK2_LIBRARIES}
-    ${wxWidgets_LIBRARIES}
-   )
-ENDIF(UNIX)
-
-ADD_DEF( _USE_WXWIDGETS_ )
-SET(BBTK_WXWIDGETS_LIBRARIES
-  ${THE_WXWIDGETS_LIBRARIES}
-  )
-
+  INCLUDE(${BBTK_CMAKE_DIR}/BBTKWxWidgets.cmake)
+  BBTK_FIND_WXWIDGETS()
+  BBTK_USE_WXWIDGETS()
 ENDIF(USE_WXWIDGETS)
 #-----------------------------------------------------------------------------