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

CMake: fix and add more options

Browse Source 
Don't overwrite options in setup.cmake.
Align text in summary message.

Always set wxUSE_XRC to values of wxUSE_XRC, same as in setup.h.
Disable wxUSE_XRC when expat is disabled.
This commit is contained in:
Maarten Bent
2018-01-27 14:28:23 +01:00
parent 90369e9632
commit e6b9b571ab
4 changed files with 56 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
build/cmake/setup.cmake
View File

@@ -471,24 +471,6 @@ endif() # CMAKE_USE_PTHREADS_INIT
check_symbol_exists(localtime_r time.h HAVE_LOCALTIME_R)
check_symbol_exists(gmtime_r time.h HAVE_GMTIME_R)
if(WXMSW)
set(wxUSE_WEBVIEW_IE ON)
elseif(WXGTK OR APPLE)
set(wxUSE_WEBVIEW_WEBKIT ON)
endif()
if(MSVC)
set(wxUSE_GRAPHICS_CONTEXT ON)
endif()
if(MSVC_VERSION GREATER 1600 AND NOT CMAKE_VS_PLATFORM_TOOLSET MATCHES "_xp$")
set(wxUSE_WINRT ON)
endif()
if(wxUSE_OPENGL)
set(wxUSE_GLCANVAS ON)
endif()
# ---------------------------------------------------------------------------
# Checks for typedefs
# ---------------------------------------------------------------------------