#=======================================================================
MACRO(CREA_FIND_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
- # DO NOT FORCE DEBUG LIBS !!
- SET(WXW_USE_DEBUG OFF)
- 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 (${CREA_CMAKE_DIR}/FindWxWidgetsWin32.cmake)
- #
+# # 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
+# # DO NOT FORCE DEBUG LIBS !!
+# SET(WXW_USE_DEBUG OFF)
+# 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 (${CREA_CMAKE_DIR}/FindWxWidgetsWin32.cmake)
+# #
+
+# find_package(wxwidgets REQUIRED COMPONENTS base core advanced adv html xml aui)
+ find_package(wxwidgets REQUIRED )
+
ELSE(WIN32)
- MESSAGE ( "===============Manual wx-config 2 EED =======================")
- SET(wxWidgets_CONFIG_EXECUTABLE /usr/bin/wx-config-2.0 CACHE STRING wxWidgets_CONFIG_EXECUTABLE FORCE)
- SET(wxWidgets_wxrc_EXECUTABLE /usr/bin/wxrc-2.8 CACHE STRING wxWidgets_wxrc_EXECUTABLE FORCE)
+
- MESSAGE ( "===============Manual wx-config 3 EED =======================")
++ MESSAGE ( "===============Manual wx-config 3 EED =======================")
+ SET(wxWidgets_CONFIG_EXECUTABLE /usr/bin/wx-config-3.0 CACHE STRING wxWidgets_CONFIG_EXECUTABLE FORCE)
+ SET(wxWidgets_wxrc_EXECUTABLE /usr/bin/wxrc-3.0 CACHE STRING wxWidgets_wxrc_EXECUTABLE FORCE)
+
++# MESSAGE ( "===============Manual wx-config 2 EED =======================")
++# SET(wxWidgets_CONFIG_EXECUTABLE /usr/bin/wx-config-2.0 CACHE STRING wxWidgets_CONFIG_EXECUTABLE FORCE)
++# SET(wxWidgets_wxrc_EXECUTABLE /usr/bin/wxrc-2.8 CACHE STRING wxWidgets_wxrc_EXECUTABLE FORCE)
+
IF(NOT wxWidgets_FOUND)
# CMake 2.6:
# technically those packages are not required
# INCLUDE( ${GTK_USE_FILE} )
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)
#=======================================================================