]> Creatis software - crea.git/commitdiff
#3386 merge vtk8itk5wx3-mingw64
authorEduardo DAVILA <davila@creatis.insa-lyon.fr>
Wed, 15 Sep 2021 11:20:44 +0000 (13:20 +0200)
committerEduardo DAVILA <davila@creatis.insa-lyon.fr>
Wed, 15 Sep 2021 11:20:44 +0000 (13:20 +0200)
cmake/CREAMacro_FindAndUseWxWidgets.cmake

index 43498b8e57c03e94e0a2fa9b6532f1f2f3a7bd69..eaf52dd73518826a1cf7e035699cd44d9a750abe 100644 (file)
@@ -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)