From d3d1a91620929a544b7356da61a5f05fea7822b8 Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Sun, 26 Apr 2020 22:01:11 +0200 Subject: [PATCH] CMake: change default GTK version from 2 to 3 --- .travis.yml | 4 ++-- build/cmake/toolkit.cmake | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4dbb33274a..38a8ba312c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,8 +29,8 @@ matrix: name: wxGTK 2 clang Ubuntu 18.04 - dist: bionic compiler: gcc - env: wxTOOLSET=cmake wxCMAKE_GENERATOR="Unix Makefiles" - name: wxGTK CMake Ubuntu 18.04 + env: wxGTK_VERSION=3 wxTOOLSET=cmake wxCMAKE_GENERATOR="Unix Makefiles" + name: wxGTK 3 CMake Ubuntu 18.04 - os: osx osx_image: xcode6.4 compiler: clang diff --git a/build/cmake/toolkit.cmake b/build/cmake/toolkit.cmake index 6b59ea69e0..2b8dbbe5db 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 gtk2) + set(wxDEFAULT_TOOLKIT gtk3) set(wxTOOLKIT_OPTIONS gtk2 gtk3 gtk4 motif qt) set(wxPLATFORM UNIX) else()