From: Eduardo DAVILA <davila@creatis.insa-lyon.fr>
Date: Wed, 25 Aug 2021 12:20:39 +0000 (+0200)
Subject: vtk8itk4wx3-mingw64 MACOS
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=b5874457abda388b3501cdfa57476de7c006c4ea;p=crea.git

vtk8itk4wx3-mingw64 MACOS
---

diff --git a/cmake/CREAMacro_FindAndUseWxWidgets.cmake b/cmake/CREAMacro_FindAndUseWxWidgets.cmake
index 151d866..24c6c86 100644
--- a/cmake/CREAMacro_FindAndUseWxWidgets.cmake
+++ b/cmake/CREAMacro_FindAndUseWxWidgets.cmake
@@ -59,29 +59,29 @@ 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_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("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)
-
       # 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