X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=cmake%2FCREAMacro_FindAndUseWxWidgets.cmake;h=baf698e29f2d2afcc7f2b0c67dcb686729e8770b;hb=5e2ead6bede930b7c36d4ea2bf55a4214eec7513;hp=24c6c8646473fef06fcbd7a965ef3550bd2b4b4f;hpb=b5874457abda388b3501cdfa57476de7c006c4ea;p=crea.git

diff --git a/cmake/CREAMacro_FindAndUseWxWidgets.cmake b/cmake/CREAMacro_FindAndUseWxWidgets.cmake
index 24c6c86..baf698e 100644
--- a/cmake/CREAMacro_FindAndUseWxWidgets.cmake
+++ b/cmake/CREAMacro_FindAndUseWxWidgets.cmake
@@ -60,28 +60,27 @@ 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)
- elseif(UNIX)
+  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(APPLE)
 	    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
@@ -135,29 +134,32 @@ MACRO(CREA_USE_WXWIDGETS)
   ELSE(WIN32)
   
 
+    IF(APPLE)
+        INCLUDE( ${wxWidgets_USE_FILE} )
+        MARK_AS_ADVANCED(wxWidgets_CONFIG_EXECUTABLE)
+        SET(WXWIDGETS_LIBRARIES
+            ${wxWidgets_LIBRARIES}
+        )
+
+message("EED WXWIDGETS_LIBRARIES: "  ${WXWIDGETS_LIBRARIES} )
 
+    ELSEIF(APPLE)
 		##    # 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})
     	# WX
 		#    INCLUDE( ${GTK_USE_FILE} )
     	INCLUDE( ${wxWidgets_USE_FILE} )
     	MARK_AS_ADVANCED(wxWidgets_CONFIG_EXECUTABLE)
-    	SET(WXWIDGETS_LIBRARIES
-      		${GTK3_LIBRARIES}
-      		${wxWidgets_LIBRARIES}      
-		)
+    	SET(WXWIDGETS_LIBRARIES	     ${GTK3_LIBRARIES}  )
+##    	SET(WXWIDGETS_LIBRARIES	     ${GTK3_LIBRARIES}       		#${GTK_LIBRARIES} )
+    ENDIF(APPLE)
 
   ENDIF(WIN32)
 ENDMACRO(CREA_USE_WXWIDGETS)