#3180 crea Feature New Normal Future - Set wx-config for wxWidgets 2.8

diff --git a/cmake/CREAMacro_FindAndUseWxWidgets.cmake b/cmake/CREAMacro_FindAndUseWxWidgets.cmake
index 969300c73478ef2338d415e949462b8c1612da53..5a765e64b5ec41139ad860a21009f54fbd3090dd 100644 (file)
--- a/cmake/CREAMacro_FindAndUseWxWidgets.cmake
+++ b/cmake/CREAMacro_FindAndUseWxWidgets.cmake
@@ -54,6 +54,10 @@ MACRO(CREA_FIND_WXWIDGETS)
     #
   
   ELSE(WIN32)
     #
   
   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)
+

     IF(NOT wxWidgets_FOUND)
     # CMake 2.6:
     # technically those packages are not required 
     IF(NOT wxWidgets_FOUND)
     # CMake 2.6:
     # technically those packages are not required 


@@ -73,6 +77,7 @@ MACRO(CREA_FIND_WXWIDGETS)
     IF(wxWidgets_FOUND)
       MESSAGE ( STATUS "=======================================")
       MESSAGE ( STATUS "Looking for wxWidgets... found ${wxWidgets_CONFIG_EXECUTABLE}")
     IF(wxWidgets_FOUND)
       MESSAGE ( STATUS "=======================================")
       MESSAGE ( STATUS "Looking for wxWidgets... found ${wxWidgets_CONFIG_EXECUTABLE}")

+

     ENDIF(wxWidgets_FOUND)
     ENDIF(NOT wxWidgets_FOUND)
   ENDIF(WIN32)
     ENDIF(wxWidgets_FOUND)
     ENDIF(NOT wxWidgets_FOUND)
   ENDIF(WIN32)


@@ -118,6 +123,7 @@ MACRO(CREA_USE_WXWIDGETS)
 #    INCLUDE( ${GTK_USE_FILE} )
     INCLUDE( ${wxWidgets_USE_FILE} )
     MARK_AS_ADVANCED(wxWidgets_CONFIG_EXECUTABLE)
 #    INCLUDE( ${GTK_USE_FILE} )
     INCLUDE( ${wxWidgets_USE_FILE} )
     MARK_AS_ADVANCED(wxWidgets_CONFIG_EXECUTABLE)

+

     SET(WXWIDGETS_LIBRARIES
       ${GTK2_LIBRARIES}
       #${GTK_LIBRARIES}
     SET(WXWIDGETS_LIBRARIES
       ${GTK2_LIBRARIES}
       #${GTK_LIBRARIES}