From 4d3190c9f7bf3bfab9eeaf2b9c431fe5c60243a0 Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Mon, 20 Apr 2020 07:37:12 -0700 Subject: [PATCH] Revert "Change default GTK version for CMake from 2 to 3" My attempt to use GTK2 for Travis CI build didn't work --- .travis.yml | 4 ++-- build/cmake/toolkit.cmake | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 962e881ecf..11f0bb397d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,8 +29,8 @@ matrix: name: wxGTK 2 clang Ubuntu 14.04 - dist: trusty compiler: gcc - env: wxTOOLSET=cmake wxCMAKE_GENERATOR="Unix Makefiles" wxCMAKE_DEFINES="-DWXGTK2=1" - name: wxGTK 2 CMake Ubuntu 14.04 + env: wxTOOLSET=cmake wxCMAKE_GENERATOR="Unix Makefiles" + name: wxGTK CMake Ubuntu 14.04 - os: osx osx_image: xcode6.4 compiler: clang diff --git a/build/cmake/toolkit.cmake b/build/cmake/toolkit.cmake index 2b8dbbe5db..6b59ea69e0 100644 --- a/build/cmake/toolkit.cmake +++ b/build/cmake/toolkit.cmake @@ -27,7 +27,7 @@ elseif(APPLE) set(wxTOOLKIT_OPTIONS osx_cocoa gtk2 gtk3 gtk4 qt) set(wxPLATFORM OSX) elseif(UNIX) - set(wxDEFAULT_TOOLKIT gtk3) + set(wxDEFAULT_TOOLKIT gtk2) set(wxTOOLKIT_OPTIONS gtk2 gtk3 gtk4 motif qt) set(wxPLATFORM UNIX) else()