Merge remote-tracking branch 'origin/changeWx28to30' into vtk7itk4wx3

[crea.git] / cmake / CREAMacro_FindAndUseWxWidgets.cmake

diff --git a/cmake/CREAMacro_FindAndUseWxWidgets.cmake b/cmake/CREAMacro_FindAndUseWxWidgets.cmake
index 969300c73478ef2338d415e949462b8c1612da53..0e1dabd267d2e34689fe2c764d47a3de3c604dab 100644 (file)
--- a/cmake/CREAMacro_FindAndUseWxWidgets.cmake
+++ b/cmake/CREAMacro_FindAndUseWxWidgets.cmake
@@ -38,7 +38,7 @@ MACRO(CREA_FIND_WXWIDGETS)
     
     #wxWidgets build related stuff
     # DO NOT FORCE DEBUG LIBS !!
-       SET(WXW_USE_DEBUG OFF)
+    SET(WXW_USE_DEBUG OFF)
     SET(WXW_USE_UNICODE OFF)
     SET(WXW_USE_SHARED ON)
     SET(WXW_USE_UNIV OFF)
@@ -58,15 +58,19 @@ MACRO(CREA_FIND_WXWIDGETS)
     # CMake 2.6:
     # technically those packages are not required 
     # since one can still use the Motif/X11 version and not the gtk one:
-    FIND_PACKAGE(PkgConfig)
-    pkg_check_modules (GTK2 gtk+-2.0)
-    #MESSAGE("${GTK2_INCLUDE_DIRS}")
+    FIND_PACKAGE(PkgConfig REQUIRED)
+
+##    pkg_check_modules (GTK2 gtk+-2.0)
+##    pkg_check_modules (GTK322 gtk+-3.0)
+    pkg_check_modules (GTK3 REQUIRED gtk+-3.0)
+    #MESSAGE("${GTK3_INCLUDE_DIRS}")
+
     # Can I require all my user to have the gl lib on linux, even if they do not really need it...
-#EED  SET(WXGLCANVASLIBS "gl")
-    # aui ?
+    SET(WXGLCANVASLIBS "gl")
+  
     SET(WXAUILIBS "aui")
     # LG : These options should be set by the user at top level of crea
-    FIND_PACKAGE(wxWidgets COMPONENTS base core adv html 
+    FIND_PACKAGE(wxWidgets COMPONENTS base core adv html
       ${WXAUILIBS}
       ${WXGLCANVASLIBS})
     #
@@ -87,7 +91,8 @@ MACRO(CREA_USE_WXWIDGETS)
   # Preprocessor settings
   CREA_DEFINE( USE_WXWIDGETS )
   CREA_DEFINE( _USE_WXWIDGETS_ )
-  #
+ 
+ #
   IF(WIN32)
     # Clean ?
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}${WXWIDGETS_CXX_FLAGS}")
@@ -108,10 +113,14 @@ MACRO(CREA_USE_WXWIDGETS)
       optimized msvcprt
       )
   ELSE(WIN32)
-    # GTK2
-    INCLUDE_DIRECTORIES(${GTK2_INCLUDE_DIRS})
-    LINK_DIRECTORIES(${GTK2_LIBRARY_DIRS})
-    LINK_LIBRARIES(${GTK2_LIBRARIES})
+##    # GTK2
+##    INCLUDE_DIRECTORIES(${GTK2_INCLUDE_DIRS})
+##    LINK_DIRECTORIES(${GTK2_LIBRARY_DIRS})
+##    LINK_LIBRARIES(${GTK2_LIBRARIES})
+    # GTK3
+    INCLUDE_DIRECTORIES(${GTK3_INCLUDE_DIRS})
+    LINK_DIRECTORIES(${GTK3_LIBRARY_DIRS})
+    LINK_LIBRARIES(${GTK3_LIBRARIES} )
     # WX
 
 
@@ -119,10 +128,14 @@ MACRO(CREA_USE_WXWIDGETS)
     INCLUDE( ${wxWidgets_USE_FILE} )
     MARK_AS_ADVANCED(wxWidgets_CONFIG_EXECUTABLE)
     SET(WXWIDGETS_LIBRARIES
-      ${GTK2_LIBRARIES}
+##    GTK2
+##      ${GTK2_LIBRARIES}
+      ${GTK3_LIBRARIES}
       #${GTK_LIBRARIES}
+
       ${wxWidgets_LIBRARIES}
       )
+
   ENDIF(WIN32)
 ENDMACRO(CREA_USE_WXWIDGETS)
 #=======================================================================