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

CMake: change default GTK version from 2 to 3

Browse Source
This commit is contained in:
Maarten Bent
2020-04-26 22:01:11 +02:00
parent b1ddd454f8
commit d3d1a91620
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 18.04 name: wxGTK 2 clang Ubuntu 18.04
- dist: bionic - dist: bionic
compiler: gcc compiler: gcc
env: wxTOOLSET=cmake wxCMAKE_GENERATOR="Unix Makefiles" env: wxGTK_VERSION=3 wxTOOLSET=cmake wxCMAKE_GENERATOR="Unix Makefiles"
name: wxGTK CMake Ubuntu 18.04 name: wxGTK 3 CMake Ubuntu 18.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 gtk2) set(wxDEFAULT_TOOLKIT gtk3)
set(wxTOOLKIT_OPTIONS gtk2 gtk3 gtk4 motif qt) set(wxTOOLKIT_OPTIONS gtk2 gtk3 gtk4 motif qt)
set(wxPLATFORM UNIX) set(wxPLATFORM UNIX)
else() else()