vtk8itk4wx3-mingw64 MACOS

[crea.git] / cmake / CREAMacro_FindAndUseWxWidgets.cmake

diff --git a/cmake/CREAMacro_FindAndUseWxWidgets.cmake b/cmake/CREAMacro_FindAndUseWxWidgets.cmake
index bc07f5594fac7fd426a90e8d5fcbd64201c1e302..24c6c8646473fef06fcbd7a965ef3550bd2b4b4f 100644 (file)
--- a/cmake/CREAMacro_FindAndUseWxWidgets.cmake
+++ b/cmake/CREAMacro_FindAndUseWxWidgets.cmake
@@ -1,7 +1,7 @@
 # ---------------------------------------------------------------------
 #
 # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
-#                        pour la Santé)
+#                        pour la Santé©
 # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
 # Previous Authors : Laurent Guigues, Jean-Pierre Roux
 # CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
@@ -58,27 +58,30 @@ MACRO(CREA_FIND_WXWIDGETS)
          MESSAGE ( "===============Manual wx-config 3 EED =======================")
 
 ##2018-08-28     
-if(APPLE)
-      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.1 CACHE STRING wxWidgets_wxrc_EXECUTABLE FORCE)
-elseif(UNIX)
+ if(APPLE)
+    message("EED CREAMacro_FindAndUseWxWidgets APPLE.  forsing wxWidgets_CONFIG_EXECUTABLE.   wxWidgets_wxrc_EXECUTABLE ")
+       set(wxWidgets_CONFIGURATION mswu)
+    set(wxWidgets_USE_LIBS)
+    #EED2021-08-25 SET(wxWidgets_CONFIG_EXECUTABLE  /opt/local/Library/Frameworks/wxWidgets.framework/Versions/wxWidgets/3.0/bin/wx-config CACHE STRING wxWidgets_CONFIG_EXECUTABLE FORCE)
+       #EED2021-08-25 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 ( "===============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)
-      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)
+        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)
        # 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 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)
+        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")   
-
       SET(WXAUILIBS "aui")
       # LG : These options should be set by the user at top level of crea
       FIND_PACKAGE(wxWidgets REQUIRED COMPONENTS base core adv html
@@ -131,33 +134,31 @@ MACRO(CREA_USE_WXWIDGETS)
                                "${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})
-       LINK_LIBRARIES(${GTK3_LIBRARIES} )
        # WX
                #    INCLUDE( ${GTK_USE_FILE} )
        INCLUDE( ${wxWidgets_USE_FILE} )
        MARK_AS_ADVANCED(wxWidgets_CONFIG_EXECUTABLE)
        SET(WXWIDGETS_LIBRARIES
-                       ##    GTK2
-                       ##      ${GTK2_LIBRARIES}
                ${GTK3_LIBRARIES}
-               #${GTK_LIBRARIES}
                ${wxWidgets_LIBRARIES}      
                )
-       endif(APPLE)
-  
+
   ENDIF(WIN32)
 ENDMACRO(CREA_USE_WXWIDGETS)
 #=======================================================================