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

3227 vtk8itk4wx3-mingw64 MACOS
---

diff --git a/cmake/CREAMacro_FindAndUseWxWidgets.cmake b/cmake/CREAMacro_FindAndUseWxWidgets.cmake
index 24c6c86..3d45b78 100644
--- a/cmake/CREAMacro_FindAndUseWxWidgets.cmake
+++ b/cmake/CREAMacro_FindAndUseWxWidgets.cmake
@@ -60,10 +60,10 @@ MACRO(CREA_FIND_WXWIDGETS)
 ##2018-08-28	  
  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)
+ 	#set(wxWidgets_CONFIGURATION mswu)
+    #set(wxWidgets_USE_LIBS)
+    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 ( "===============Manual wx-config 2 EED =======================")
@@ -80,14 +80,15 @@ MACRO(CREA_FIND_WXWIDGETS)
         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
-      ${WXAUILIBS}
-      ${WXGLCANVASLIBS}
+    # 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
+        ${WXAUILIBS}
+        ${WXGLCANVASLIBS}
     )
+
     IF(wxWidgets_FOUND)
       MESSAGE ( STATUS "=======================================")
       MESSAGE ( STATUS "Looking for wxWidgets... found ${wxWidgets_CONFIG_EXECUTABLE}")