Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Change default GTK version for CMake from 2 to 3"

Browse Source 
My attempt to use GTK2 for Travis CI build didn't work
This commit is contained in:
Paul Cornett
2020-04-20 07:37:12 -07:00
parent f655a52fba
commit 4d3190c9f7
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@@ -29,8 +29,8 @@ matrix:
name: wxGTK 2 clang Ubuntu 14.04 name: wxGTK 2 clang Ubuntu 14.04
- dist: trusty - dist: trusty
compiler: gcc compiler: gcc
env: wxTOOLSET=cmake wxCMAKE_GENERATOR="Unix Makefiles" wxCMAKE_DEFINES="-DWXGTK2=1" env: wxTOOLSET=cmake wxCMAKE_GENERATOR="Unix Makefiles"
name: wxGTK 2 CMake Ubuntu 14.04 name: wxGTK CMake Ubuntu 14.04
- os: osx - os: osx
osx_image: xcode6.4 osx_image: xcode6.4
compiler: clang compiler: clang

2
build/cmake/toolkit.cmake
View File

@@ -27,7 +27,7 @@ elseif(APPLE)
set(wxTOOLKIT_OPTIONS osx_cocoa gtk2 gtk3 gtk4 qt) set(wxTOOLKIT_OPTIONS osx_cocoa gtk2 gtk3 gtk4 qt)
set(wxPLATFORM OSX) set(wxPLATFORM OSX)
elseif(UNIX) elseif(UNIX)
set(wxDEFAULT_TOOLKIT gtk3) set(wxDEFAULT_TOOLKIT gtk2)
set(wxTOOLKIT_OPTIONS gtk2 gtk3 gtk4 motif qt) set(wxTOOLKIT_OPTIONS gtk2 gtk3 gtk4 motif qt)
set(wxPLATFORM UNIX) set(wxPLATFORM UNIX)
else() else()