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

Merge branch 'cmake-fixes' of https://github.com/MaartenBent/wxWidgets

Browse Source 
CMake fixes including support for building wxGTK3 on Windows.

See https://github.com/wxWidgets/wxWidgets/pull/768
This commit is contained in:
Vadim Zeitlin
2018-03-31 01:42:12 +02:00
parent d13542fe7c c103ab686c
commit 70cb9739f6
6 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build/cmake/lib/adv/CMakeLists.txt
View File

@@ -18,7 +18,11 @@ if(WXMSW)
elseif(WXOSX_COCOA)
wx_append_sources(ADV_FILES ADVANCED_OSX_COCOA)
elseif(WXGTK)
wx_append_sources(ADV_FILES ADVANCED_GTK2)
if(WXGTK2)
wx_append_sources(ADV_FILES ADVANCED_GTK2)
else()
wx_append_sources(ADV_FILES ADVANCED_GTK)
endif()
wx_append_sources(ADV_FILES ADVANCED_GTK_NATIVE)
if(WIN32)
wx_append_sources(ADV_FILES ADVANCED_GTK_WIN32)

2
build/cmake/lib/aui/CMakeLists.txt
View File

@@ -13,7 +13,7 @@ wx_append_sources(AUI_FILES AUI_CMN)
if(WXMSW)
wx_append_sources(AUI_FILES AUI_MSW)
elseif(WXGTK)
elseif(WXGTK2)
wx_append_sources(AUI_FILES AUI_GTK)
endif()

11
build/cmake/lib/core/CMakeLists.txt
View File

@@ -9,8 +9,6 @@
include(../../source_groups.cmake)
wx_option(wxUSE_IMAGE "use wxImage class" ON)
wx_append_sources(CORE_SRC GUI_CMN)
wx_append_sources(CORE_SRC BASE_AND_GUI_CMN)
if(WIN32)
@@ -25,8 +23,13 @@ if(WXMSW)
wx_append_sources(CORE_SRC MSW)
wx_append_sources(CORE_SRC MSW_DESKTOP)
elseif(WXGTK)
wx_append_sources(CORE_SRC GTK2_LOWLEVEL)
wx_append_sources(CORE_SRC GTK2)
if(WXGTK2)
wx_append_sources(CORE_SRC GTK2_LOWLEVEL)
wx_append_sources(CORE_SRC GTK2)
else()
wx_append_sources(CORE_SRC GTK_LOWLEVEL)
wx_append_sources(CORE_SRC GTK)
endif()
if(UNIX)
wx_append_sources(CORE_SRC XWIN_LOWLEVEL)