From 07a3b888e31a7ca3bcaf02d8e81b2ddef2d534e8 Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Mon, 13 Sep 2021 13:56:24 +0200 Subject: [PATCH] #3386 merge vtk8itk5wx3-mingw64 --- cmake/CREAMacro_FindAndUseWxWidgets.cmake | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/cmake/CREAMacro_FindAndUseWxWidgets.cmake b/cmake/CREAMacro_FindAndUseWxWidgets.cmake index 8acd436..43498b8 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 @@ -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) -- 2.47.1