#3390 vtk8itk5wx3-macos in Linux

[crea.git] / cmake / CREAMacro_FindAndUseWxWidgets.cmake

diff --git a/cmake/CREAMacro_FindAndUseWxWidgets.cmake b/cmake/CREAMacro_FindAndUseWxWidgets.cmake
index 151d866f320cd9e2c82584c9bec01ab3c13294eb..eaf4b1cdf36b7b7b1d1901b83fd5e70d0525cb1e 100644 (file)
--- a/cmake/CREAMacro_FindAndUseWxWidgets.cmake
+++ b/cmake/CREAMacro_FindAndUseWxWidgets.cmake
@@ -59,11 +59,11 @@ MACRO(CREA_FIND_WXWIDGETS)
 
 ##2018-08-28     
  if(APPLE)
-         message("EED CREAMacro_FindAndUseWxWidgets APPLE.  forsing wxWidgets_CONFIG_EXECUTABLE.   wxWidgets_wxrc_EXECUTABLE ")
-       SET(wxWidgets_CONFIG_EXECUTABLE  /opt/local/Library/Frameworks/wxWidgets.framework/Versions/wxGTK/3.0/bin/wx-config CACHE STRING wxWidgets_CONFIG_EXECUTABLE FORCE)
-         SET(wxWidgets_wxrc_EXECUTABLE   /opt/local/Library/Frameworks/wxWidgets.framework/Versions/wxGTK/3.0/bin/wxrc-3.0 CACHE STRING wxWidgets_wxrc_EXECUTABLE FORCE)
+    message("EED CREAMacro_FindAndUseWxWidgets APPLE.  forsing wxWidgets_CONFIG_EXECUTABLE.   wxWidgets_wxrc_EXECUTABLE ")
+  SET(wxWidgets_CONFIG_EXECUTABLE  /opt/local/Library/Frameworks/wxWidgets.framework/Versions/wxWidgets/3.0/bin/wx-config CACHE STRING wxWidgets_CONFIG_EXECUTABLE FORCE)
+       SET(wxWidgets_wxrc_EXECUTABLE   /opt/local/Library/Frameworks/wxWidgets.framework/Versions/wxWidgets/3.0/bin/wxrc-3.0 CACHE STRING wxWidgets_wxrc_EXECUTABLE FORCE)
  elseif(UNIX)
-         message("EED CREAMacro_FindAndUseWxWidgets UNIX")
+           message("EED CREAMacro_FindAndUseWxWidgets UNIX")
                #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)
@@ -72,12 +72,11 @@ 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:
- endif(APPLE)
-
       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)
+endif(APPLE)
 
       # Can I require all my user to have the gl lib on linux, even if they do not really need it...
       SET(WXGLCANVASLIBS "gl")   
@@ -103,7 +102,7 @@ MACRO(CREA_USE_WXWIDGETS)
   # Preprocessor settings
   CREA_DEFINE( USE_WXWIDGETS )
   CREA_DEFINE( _USE_WXWIDGETS_ )
- 
+
  #
   IF(WIN32)
 #    # Clean ?
@@ -133,23 +132,25 @@ MACRO(CREA_USE_WXWIDGETS)
                                "${wxWidgets_LIB_DIR}/libwxmsw30u_html.a"   
                                "${wxWidgets_LIB_DIR}/libwxmsw30u_adv.a" )        
   ELSE(WIN32)
-  
-
-
+    IF(APPLE)
+        INCLUDE( ${wxWidgets_USE_FILE} )
+        MARK_AS_ADVANCED(wxWidgets_CONFIG_EXECUTABLE)
+        SET(WXWIDGETS_LIBRARIES
+            ${wxWidgets_LIBRARIES}
+        )
+    ELSEIF(UNIX)
                ##    # GTK2
                ##    INCLUDE_DIRECTORIES(${GTK2_INCLUDE_DIRS})
                ##    LINK_DIRECTORIES(${GTK2_LIBRARY_DIRS})
                ##    LINK_LIBRARIES(${GTK2_LIBRARIES})
-        ##    SET(WXWIDGETS_LIBRARIES
-        ##                 GTK2
-        ##                 ${GTK2_LIBRARIES}
-        ##               #${GTK_LIBRARIES}
-        ##                 ${wxWidgets_LIBRARIES}      
-        ##             )
-               
        # GTK3
-       INCLUDE_DIRECTORIES(${GTK3_INCLUDE_DIRS})
-       LINK_DIRECTORIES(${GTK3_LIBRARY_DIRS})
+        INCLUDE_DIRECTORIES(${GTK3_INCLUDE_DIRS})
+        LINK_DIRECTORIES(${GTK3_LIBRARY_DIRS})
+        LINK_LIBRARIES(${GTK3_LIBRARIES} )
+               message("EED GTK3_VERSION "${GTK3_VERSION})
+        message("EED GTK3_INCLUDE_DIRS "${GTK3_INCLUDE_DIRS})
+        message("EED GTK3_LIBRARY_DIRS "${GTK3_LIBRARY_DIRS})
+        message("EED GTK3_LIBRARIES "${GTK3_LIBRARIES})
        # WX
                #    INCLUDE( ${GTK_USE_FILE} )
        INCLUDE( ${wxWidgets_USE_FILE} )
@@ -159,6 +160,9 @@ MACRO(CREA_USE_WXWIDGETS)
                ${wxWidgets_LIBRARIES}      
                )
 
+
+
+    ENDIF(APPLE)
   ENDIF(WIN32)
 ENDMACRO(CREA_USE_WXWIDGETS)
 #=======================================================================