#3386 merge vtk8itk5wx3-mingw64

diff --git a/cmake/CREAMacro_FindAndUseWxWidgets.cmake b/cmake/CREAMacro_FindAndUseWxWidgets.cmake
index 8acd436ff52be7cb7f42e381012fc986608ad614..43498b8e57c03e94e0a2fa9b6532f1f2f3a7bd69 100644 (file)
--- 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
@@ -134,16 +134,17 @@ MACRO(CREA_USE_WXWIDGETS)
   ELSE(WIN32)
   
 
-
+    IF(APPLE)
+    ELSEIF(APPLE)
                ##    # 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})
+        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} )
@@ -153,8 +154,9 @@ message("EED GTK3_VERSION "${GTK3_VERSION})
                        ##      ${GTK2_LIBRARIES}
                ${GTK3_LIBRARIES}
                #${GTK_LIBRARIES}
-               ${wxWidgets_LIBRARIES}      
+            ${wxWidgets_LIBRARIES}      
                )
+    ENDIF(APPLE)
 
   ENDIF(WIN32)
 ENDMACRO(CREA_USE_WXWIDGETS)