X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=cmake%2FCREAMacro_FindAndUseWxWidgets.cmake;h=ecf3892e0c99674bedb17742dc58c4eb95c2a116;hb=8630e8e0be90e8e8519086b66eecda83e095e87e;hp=1e7c6ca7ef8ae12122aeca01e919ec6890b209a2;hpb=4015d9762f1a6d7bf7436aa5c2004bb94fd86702;p=crea.git

diff --git a/cmake/CREAMacro_FindAndUseWxWidgets.cmake b/cmake/CREAMacro_FindAndUseWxWidgets.cmake
index 1e7c6ca..ecf3892 100644
--- 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
@@ -55,39 +55,44 @@ MACRO(CREA_FIND_WXWIDGETS)
   
   ELSE(WIN32)
 
-      MESSAGE ( "===============Manual wx-config 3 EED =======================")
+	  MESSAGE ( "===============Manual wx-config 3 EED =======================")
+
+##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/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 =======================")
+		#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)
+      	# 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)
 
-    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")	  
 
-    # 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 COMPONENTS base core adv html
-      ${WXAUILIBS}
-      ${WXGLCANVASLIBS})
-    #
+      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}")
     ENDIF(wxWidgets_FOUND)
-    ENDIF(NOT wxWidgets_FOUND)
+    
   ENDIF(WIN32)
   
-
-
 ENDMACRO(CREA_FIND_WXWIDGETS)
 #=======================================================================
 
@@ -96,7 +101,7 @@ MACRO(CREA_USE_WXWIDGETS)
   # Preprocessor settings
   CREA_DEFINE( USE_WXWIDGETS )
   CREA_DEFINE( _USE_WXWIDGETS_ )
- 
+
  #
   IF(WIN32)
 #    # Clean ?
@@ -120,35 +125,48 @@ MACRO(CREA_USE_WXWIDGETS)
 	  
 	include(${wxWidgets_USE_FILE})
 	
+
 	SET(WXWIDGETS_LIBRARIES ${wxWidgets_LIBRARIES}   
-	            "${wxWidgets_LIB_DIR}/libwxmsw31u_aui.a"   
-				"${wxWidgets_LIB_DIR}/libwxmsw31u_webview.a"    
-				"${wxWidgets_LIB_DIR}/libwxmsw31u_html.a"   
-				"${wxWidgets_LIB_DIR}/libwxmsw31u_adv.a" )    	  
+	            "${wxWidgets_LIB_DIR}/libwxmsw32u_aui.a"   
+				"${wxWidgets_LIB_DIR}/libwxmsw32u_webview.a"    
+				"${wxWidgets_LIB_DIR}/libwxmsw32u_html.a"   
+				"${wxWidgets_LIB_DIR}/libwxmsw32u_adv.a" 
+	            "${wxWidgets_LIB_DIR}/libwxmsw32u_gl.a"   
+	            "${wxWidgets_LIB_DIR}/libwxmsw32u_media.a"   
+	            "${wxWidgets_LIB_DIR}/libwxmsw32u_core.a"   
+	            "${wxWidgets_LIB_DIR}/libwxbase32u.a"   
+	            "${wxWidgets_LIB_DIR}/libwxbase32u_net.a"   
+				)    	  
+	
   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} )
+		message("EED GTK3_VERSION "${GTK3_VERSION})
+        message("EED GTK3_INCLUDE_DIRS "${GTK3_INCLUDE_DIRS})
+        message("EED GTK3_LIBRARY_DIRS "${GTK3_LIBRARY_DIRS})
+        message("EED GTK3_LIBRARIES "${GTK3_LIBRARIES})
+    	# WX
+		#    INCLUDE( ${GTK_USE_FILE} )
+    	INCLUDE( ${wxWidgets_USE_FILE} )
+    	MARK_AS_ADVANCED(wxWidgets_CONFIG_EXECUTABLE)
+    	SET(WXWIDGETS_LIBRARIES
+      		${GTK3_LIBRARIES}
+      		${wxWidgets_LIBRARIES}      
+		)
+    ENDIF(APPLE)
   ENDIF(WIN32)
 ENDMACRO(CREA_USE_WXWIDGETS)
 #=======================================================================