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

Fix typos and whitespace in CMake files.

Browse Source
This commit is contained in:
Maarten Bent 2018-08-17 19:15:08 +02:00
parent 61500907ee
commit 0bf459de92
6 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build/cmake/README.md
View File

@ -28,9 +28,9 @@ Files
* Every function should contain a short description of it's parameters as
a comment before the function/macro
* install.cmake
* Handles defintions for the `install` and `uninstall` target
* Handles definitions for the `install` and `uninstall` target
* init.cmake
* Intializes various variables used during the build process and for
* Initializes various variables used during the build process and for
generation of setup.h and configuration files
* main.cmake
* Includes all other cmake files
@ -60,7 +60,7 @@ _.cmake_ files.
* Defines build targets for demos via `wx_add_demo()`
* lib
* Defines build targets for all libraries and bundle third party libraries
* Each library is contained in a seperate directory and uses
* Each library is contained in a separate directory and uses
`wx_add_library()` to define the library target
* Bundled third party library without upstream CMake support are defined in
a _.cmake_ file using `wx_add_builtin_library()` to define static library
@ -70,8 +70,8 @@ _.cmake_ files.
* Includes the [cotire module][4] used to for precompiled header generation
* samples
* Defines build targets for all samples via `wx_add_sample()`
* Defintions for trivial samples are included in _CMakeLists.txt_ more
complex samples might have a seperate .cmake file
* Definitions for trivial samples are included in _CMakeLists.txt_ more
complex samples might have a separate .cmake file
* tests
* Defines build targets for all tests
* utils

4
build/cmake/functions.cmake
View File

@ -8,7 +8,7 @@
#############################################################################
include(CMakeDependentOption)
include(CMakeParseArguments) # For compatiblity with CMake < 3.4
include(CMakeParseArguments) # For compatibility with CMake < 3.4
include(ExternalProject)
if(CMAKE_GENERATOR STREQUAL "Xcode")
# wxWidgets does not use the unity features of cotire so we can
@ -546,7 +546,7 @@ endfunction()
# IMPORTANT does not require wxBUILD_SAMPLES=ALL
# RES followed by WIN32 .rc files
#
# Additinally the following variables may be set before calling wx_add_sample:
# Additionally the following variables may be set before calling wx_add_sample:
# wxSAMPLE_SUBDIR subdirectory in the samples/ folder to use as base
# wxSAMPLE_FOLDER IDE sub folder to be used for the samples
function(wx_add_sample name)

2
build/cmake/init.cmake
View File

@ -76,7 +76,7 @@ if(MSVC OR MINGW)
endif()
if(MSVC)
# Include generator expression to supress default Debug/Release pair
# Include generator expression to suppress default Debug/Release pair
set(wxPLATFORM_LIB_DIR "$<1:/>${wxCOMPILER_PREFIX}${wxARCH_SUFFIX}_${lib_suffix}")
else()
set(wxPLATFORM_LIB_DIR "/${wxCOMPILER_PREFIX}${wxARCH_SUFFIX}_${lib_suffix}")

1
build/cmake/options.cmake
View File

@ -403,7 +403,6 @@ if(WIN32)
set(wxUSE_WINRT_DEFAULT OFF)
endif()
wx_option(wxUSE_WINRT "enable WinRT support" ${wxUSE_WINRT_DEFAULT})
endif()
# this one is not really MSW-specific but it exists mainly to be turned off

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

@ -199,7 +199,7 @@ wx_list_add_prefix(WIDGETS_RC_FILES icons/
slider.xpm spinbtn.xpm statbmp.xpm statbox.xpm
stattext.xpm text.xpm timepick.xpm toggle.xpm
)
wx_add_sample(widgets IMPORTANT ${SAMPLE_WIDGETS_SRC}
wx_add_sample(widgets IMPORTANT ${SAMPLE_WIDGETS_SRC}
DATA ${WIDGETS_RC_FILES} textctrl.cpp
LIBRARIES adv
)
@ -258,7 +258,7 @@ if(WIN32)
if(MSVC)
wx_add_sample(flash)
endif()
#TODO: renable when sample is fixed
#TODO: reenable when sample is fixed
#wx_add_sample(mfc mfctest.cpp mfctest.h resource.h stdafx.h RES mfctest.rc)
wx_add_sample(nativdlg nativdlg.cpp nativdlg.h resource.h RES nativdlg.rc)
wx_add_sample(oleauto DEPENDS wxUSE_OLE)

2
build/cmake/setup.cmake
View File

@ -310,7 +310,7 @@ if(NOT WIN32)
statfs(\"/\", &fs);"
HAVE_STATFS_DECL)
else()
# TODO: implment statvfs checks
# TODO: implement statvfs checks
if(HAVE_STATVFS)
set(WX_STATFS_T statvfs_t)
endif()