X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=cmake%2FCREAMacro_FindAndUseWxWidgets.cmake;h=bc07f5594fac7fd426a90e8d5fcbd64201c1e302;hb=fa9a448de6690f29627216055d16fe1503d46f54;hp=b10b9f7212f54f45e4d662649a33c88635ceae7b;hpb=c08e99c2447c01473c687f3cd518304405f03d83;p=crea.git

diff --git a/cmake/CREAMacro_FindAndUseWxWidgets.cmake b/cmake/CREAMacro_FindAndUseWxWidgets.cmake
index b10b9f7..bc07f55 100644
--- a/cmake/CREAMacro_FindAndUseWxWidgets.cmake
+++ b/cmake/CREAMacro_FindAndUseWxWidgets.cmake
@@ -59,49 +59,39 @@ MACRO(CREA_FIND_WXWIDGETS)
 
 ##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)
+		#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)
-elseif(UNIX)
-      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)
-endif()
-
-
-#      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)
-
-    IF(NOT wxWidgets_FOUND)
-    # 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)
-    #MESSAGE("${GTK3_INCLUDE_DIRS}")
-
-    # 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
+      	# 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)
+
+      # 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})
-    #
+      ${WXGLCANVASLIBS}
+    )
     IF(wxWidgets_FOUND)
       MESSAGE ( STATUS "=======================================")
       MESSAGE ( STATUS "Looking for wxWidgets... found ${wxWidgets_CONFIG_EXECUTABLE}")
-
     ENDIF(wxWidgets_FOUND)
-    ENDIF(NOT wxWidgets_FOUND)
+    
   ENDIF(WIN32)
   
-MESSAGE ( "EEEE")
-
-
 ENDMACRO(CREA_FIND_WXWIDGETS)
 #=======================================================================
 
@@ -142,28 +132,32 @@ MACRO(CREA_USE_WXWIDGETS)
   ELSE(WIN32)
   
   
-##    # GTK2
-##    INCLUDE_DIRECTORIES(${GTK2_INCLUDE_DIRS})
-##    LINK_DIRECTORIES(${GTK2_LIBRARY_DIRS})
-##    LINK_LIBRARIES(${GTK2_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}      
-      )
-
+ 	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})
+    	# 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)
 #=======================================================================