X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fcmake%2FBBTKFindLibraries.cmake;h=5a86dd340c49606eb4efe4fe44b57a751b940d38;hb=a7b5e75baf0af42a27092233d3b3350d8ec2d5da;hp=4b7316405e9e7906fbdd13f0439a7c089811a5c1;hpb=e04a3f7bc34fada6a357adcf8bcf2021f54d8ff8;p=bbtk.git

diff --git a/kernel/cmake/BBTKFindLibraries.cmake b/kernel/cmake/BBTKFindLibraries.cmake
index 4b73164..5a86dd3 100644
--- a/kernel/cmake/BBTKFindLibraries.cmake
+++ b/kernel/cmake/BBTKFindLibraries.cmake
@@ -112,69 +112,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)
-  #
-  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)
 #-----------------------------------------------------------------------------