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

2
build/cmake/functions.cmake
View File

@@ -378,7 +378,7 @@ macro(wx_lib_include_directories name)
list(APPEND wxMONO_INCLUDE_DIRS_PUBLIC ${_LIB_INCLUDE_DIRS_PUBLIC}) list(APPEND wxMONO_INCLUDE_DIRS_PUBLIC ${_LIB_INCLUDE_DIRS_PUBLIC})
list(APPEND wxMONO_INCLUDE_DIRS_PRIVATE ${_LIB_INCLUDE_DIRS_PRIVATE}) list(APPEND wxMONO_INCLUDE_DIRS_PRIVATE ${_LIB_INCLUDE_DIRS_PRIVATE})
else() else()
target_include_directories(${name};${ARGN}) target_include_directories(${name};BEFORE;${ARGN})
endif() endif()
endmacro() endmacro()

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

@@ -18,7 +18,11 @@ if(WXMSW)
elseif(WXOSX_COCOA) elseif(WXOSX_COCOA)
wx_append_sources(ADV_FILES ADVANCED_OSX_COCOA) wx_append_sources(ADV_FILES ADVANCED_OSX_COCOA)
elseif(WXGTK) 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) wx_append_sources(ADV_FILES ADVANCED_GTK_NATIVE)
if(WIN32) if(WIN32)
wx_append_sources(ADV_FILES ADVANCED_GTK_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) if(WXMSW)
wx_append_sources(AUI_FILES AUI_MSW) wx_append_sources(AUI_FILES AUI_MSW)
elseif(WXGTK) elseif(WXGTK2)
wx_append_sources(AUI_FILES AUI_GTK) wx_append_sources(AUI_FILES AUI_GTK)
endif() endif()

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

@@ -9,8 +9,6 @@
include(../../source_groups.cmake) include(../../source_groups.cmake)
wx_option(wxUSE_IMAGE "use wxImage class" ON)
wx_append_sources(CORE_SRC GUI_CMN) wx_append_sources(CORE_SRC GUI_CMN)
wx_append_sources(CORE_SRC BASE_AND_GUI_CMN) wx_append_sources(CORE_SRC BASE_AND_GUI_CMN)
if(WIN32) if(WIN32)
@@ -25,8 +23,13 @@ if(WXMSW)
wx_append_sources(CORE_SRC MSW) wx_append_sources(CORE_SRC MSW)
wx_append_sources(CORE_SRC MSW_DESKTOP) wx_append_sources(CORE_SRC MSW_DESKTOP)
elseif(WXGTK) elseif(WXGTK)
wx_append_sources(CORE_SRC GTK2_LOWLEVEL) if(WXGTK2)
wx_append_sources(CORE_SRC GTK2) 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) if(UNIX)
wx_append_sources(CORE_SRC XWIN_LOWLEVEL) wx_append_sources(CORE_SRC XWIN_LOWLEVEL)

7
build/cmake/options.cmake
View File

@@ -101,7 +101,12 @@ wx_option(wxUSE_ON_FATAL_EXCEPTION "catch signals in wxApp::OnFatalException")
wx_option(wxUSE_CMDLINE_PARSER "use wxCmdLineParser class") wx_option(wxUSE_CMDLINE_PARSER "use wxCmdLineParser class")
wx_option(wxUSE_DATETIME "use wxDateTime class") wx_option(wxUSE_DATETIME "use wxDateTime class")
wx_option(wxUSE_DEBUGREPORT "use wxDebugReport class") wx_option(wxUSE_DEBUGREPORT "use wxDebugReport class")
wx_option(wxUSE_DIALUP_MANAGER "use dialup network classes") if(APPLE)
set(wxUSE_DIALUP_MANAGER_DEFAULT OFF)
else()
set(wxUSE_DIALUP_MANAGER_DEFAULT ON)
endif()
wx_option(wxUSE_DIALUP_MANAGER "use dialup network classes" ${wxUSE_DIALUP_MANAGER_DEFAULT})
wx_option(wxUSE_DYNLIB_CLASS "use wxLibrary class for DLL loading") wx_option(wxUSE_DYNLIB_CLASS "use wxLibrary class for DLL loading")
wx_option(wxUSE_DYNAMIC_LOADER "use (new) wxDynamicLibrary class") wx_option(wxUSE_DYNAMIC_LOADER "use (new) wxDynamicLibrary class")
wx_option(wxUSE_EXCEPTIONS "build exception-safe library") wx_option(wxUSE_EXCEPTIONS "build exception-safe library")

6
build/cmake/samples/CMakeLists.txt
View File

@@ -7,7 +7,7 @@
# Licence: wxWindows licence # Licence: wxWindows licence
############################################################################# #############################################################################
wx_add_sample(access accesstest.cpp DEPENDS wxUSE_ACCESSBILITY) wx_add_sample(access accesstest.cpp DEPENDS wxUSE_ACCESSIBILITY)
wx_add_sample(animate anitest.cpp anitest.h LIBRARIES adv DATA throbber.gif hourglass.ani DEPENDS wxUSE_ANIMATIONCTRL) wx_add_sample(animate anitest.cpp anitest.h LIBRARIES adv DATA throbber.gif hourglass.ani DEPENDS wxUSE_ANIMATIONCTRL)
wx_add_sample(archive CONSOLE) wx_add_sample(archive CONSOLE)
wx_add_sample(artprov arttest.cpp artbrows.cpp artbrows.h) wx_add_sample(artprov arttest.cpp artbrows.cpp artbrows.h)
@@ -24,7 +24,7 @@ if(wxUSE_ON_FATAL_EXCEPTION AND (NOT WIN32 OR MSVC))
wx_add_sample(debugrpt LIBRARIES qa DEPENDS wxUSE_DEBUGREPORT) wx_add_sample(debugrpt LIBRARIES qa DEPENDS wxUSE_DEBUGREPORT)
endif() endif()
wx_add_sample(dialogs dialogs.cpp dialogs.h LIBRARIES adv DATA tips.txt) wx_add_sample(dialogs dialogs.cpp dialogs.h LIBRARIES adv DATA tips.txt)
wx_add_sample(dialup nettest.cpp DEPENDS wxUSE_DIALUP_MANAGER) wx_add_sample(dialup nettest.cpp LIBRARIES net DEPENDS wxUSE_DIALUP_MANAGER)
wx_add_sample(display DEPENDS wxUSE_DISPLAY) wx_add_sample(display DEPENDS wxUSE_DISPLAY)
wx_add_sample(dnd dnd.cpp RES dnd.rc DATA wxwin.png DEPENDS wxUSE_DRAG_AND_DROP) wx_add_sample(dnd dnd.cpp RES dnd.rc DATA wxwin.png DEPENDS wxUSE_DRAG_AND_DROP)
wx_add_sample(docview docview.cpp doc.cpp view.cpp docview.h doc.h view.h wx_add_sample(docview docview.cpp doc.cpp view.cpp docview.h doc.h view.h
@@ -231,7 +231,7 @@ if(WIN32)
# Windows only samples # Windows only samples
# DLL Sample # DLL Sample
if(wxUSE_DYNLIBCLASS) if(wxUSE_DYNLIB_CLASS)
wx_add_sample(dll DLL my_dll.cpp my_dll.h NAME my_dll FOLDER dll wx_add_sample(dll DLL my_dll.cpp my_dll.h NAME my_dll FOLDER dll
DEFINITIONS MY_DLL_BUILDING) DEFINITIONS MY_DLL_BUILDING)
if(NOT wxBUILD_SHARED) if(NOT wxBUILD_SHARED)