From: Eduardo DAVILA Date: Wed, 15 Sep 2021 11:20:44 +0000 (+0200) Subject: #3386 merge vtk8itk5wx3-mingw64 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=7bead616d748b4783d416b497e615c9f1a5c001a;p=crea.git #3386 merge vtk8itk5wx3-mingw64 --- diff --git a/cmake/CREAMacro_FindAndUseWxWidgets.cmake b/cmake/CREAMacro_FindAndUseWxWidgets.cmake index 43498b8..eaf52dd 100644 --- a/cmake/CREAMacro_FindAndUseWxWidgets.cmake +++ b/cmake/CREAMacro_FindAndUseWxWidgets.cmake @@ -135,6 +135,11 @@ MACRO(CREA_USE_WXWIDGETS) IF(APPLE) + INCLUDE( ${wxWidgets_USE_FILE} ) + MARK_AS_ADVANCED(wxWidgets_CONFIG_EXECUTABLE) + SET(WXWIDGETS_LIBRARIES + ${wxWidgets_LIBRARIES} + ) ELSEIF(APPLE) ## # GTK2 ## INCLUDE_DIRECTORIES(${GTK2_INCLUDE_DIRS}) @@ -149,13 +154,8 @@ MACRO(CREA_USE_WXWIDGETS) # 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} - ) + SET(WXWIDGETS_LIBRARIES ${GTK3_LIBRARIES} ) +## SET(WXWIDGETS_LIBRARIES ${GTK3_LIBRARIES} #${GTK_LIBRARIES} ) ENDIF(APPLE) ENDIF(WIN32)