summaryrefslogtreecommitdiff
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'sphinx-info' into release-3.12v3.12.0-rc1Brad King2018-06-131-1/+6
|\ | | | | | | Merge-request: !2146
| * Utilities/Sphinx: Add option to build and install Info manualOrivej Desh2018-06-121-1/+6
| | | | | | | | | | Add option `SPHINX_INFO` to enable the Sphinx 'texinfo' builder and use the `makeinfo` tool to convert it to a `.info` file.
* | Merge branch 'restore-windows-resources-through-link' into release-3.12Brad King2018-06-131-1/+2
|\ \ | | | | | | | | | Merge-request: !2147
| * | Windows: Restore support for running CMake through a symlinkBrad King2018-06-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit v3.11.3~3^2 (cmSystemTools: Revert GetRealPath implementation on Windows, 2018-05-29) broke the feature added by commit v3.11.0-rc1~64^2 (Windows: Add support for running CMake tools through a symlink, 2018-01-21). Use `GetRealPathResolvingWindowsSubst` in the latter code path to restore it. Fixes: #17882
| * | CMake 3.11.3v3.11.3Brad King2018-05-311-1/+1
| | |
| * | Merge branch 'cpack-wix-sources' into release-3.11Brad King2018-05-301-2/+2
| |\ \ | | | | | | | | | | | | Merge-request: !2116
* | \ \ Merge branch 'ninja-win-rsp' into release-3.12Brad King2018-06-081-4/+4
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !2136
| * | | | Ninja: Use native slashes to pass rsp filesMatthijs Kool2018-06-081-4/+4
| | |_|/ | |/| | | | | | | | | | | | | | Some tools on Windows (e.g. Embarcadero linkers) can't handle forward slashes in paths to rsp files.
* | | | CMake 3.12.0-rc1 version updateBrad King2018-06-051-3/+3
|/ / /
* | | Merge topic 'more-misc-typos'Brad King2018-06-0520-26/+26
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | be28106880 Fix misc. typos Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Alex Turbov <i.zaufi@gmail.com> Merge-request: !2130
| * | | Fix misc. typosluz.paz2018-06-0420-26/+26
| | | | | | | | | | | | | | | | Found via `codespell` and `grep`
* | | | CMake Nightly Date StampKitware Robot2018-06-051-1/+1
| | | |
* | | | Merge topic 'libarchive-ssize_t'Brad King2018-06-041-1/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6d8ae1e6e4 cmSystemTools: Restore compilation with libarchive versions below 3.3.1 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2126
| * | | | cmSystemTools: Restore compilation with libarchive versions below 3.3.1Brad King2018-06-011-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit a203fcc63d (cmake: Teach '-E tar' to report errors copying data, 2018-05-16) we introduced use of `la_ssize_t` but that was not available until libarchive 3.3.1. Switch to the `__LA_SSIZE_T` macro we use elsewhere.
* | | | | Merge topic 'update-kwsys'Brad King2018-06-0460-1644/+1675
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 81870f1159 Merge branch 'upstream-KWSys' into update-kwsys 3af8c7715b KWSys 2018-06-01 (8ef62b28) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2125
| * | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2018-06-0160-1644/+1675
| |/ / / | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2018-06-01 (8ef62b28)
* | | | CMake Nightly Date StampKitware Robot2018-06-041-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2018-06-031-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2018-06-021-1/+1
|/ / /
* | | Revise C++ coding style using clang-format-6.0Kitware Robot2018-06-01210-2002/+2499
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Run the `clang-format.bash` script to update all our C and C++ code to a new style defined by `.clang-format`. Use `clang-format` version 6.0. * If you reached this commit for a line in `git blame`, re-run the blame operation starting at the parent of this commit to see older history for the content. * See the parent commit for instructions to rebase a change across this style transition commit.
* | | clang-format.bash: update to clang-format-6.0Brad King2018-06-012-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update `.clang-format` with configuration to make the 6.0 format as close as possible to what 3.8 produced before. Then revise the style: * Indent preprocessor directives (a feature new since 3.8) * Add a newline and indentation before inheritance `:` and `,` Rename the Git attribute identifying the format to include the clang-format version number: `format.clang-format-6.0`. This will aid external infrastructure in knowing what version of the tool to run.
* | | Merge topic 'autogen_autorcc_multi_config'Brad King2018-06-016-11/+76
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5852acffa4 Autogen: Add AUTORCC configuration change test 41685c8ba0 Autogen: Let AUTORCC generate output for all configurations 2930a198f6 Autogen: Add lock file to AUTORCC commands Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2117
| * | | Autogen: Let AUTORCC generate output for all configurationsSebastian Holtermann2018-05-301-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For multi configuration generators let AUTORCC generate the rcc output for all configurations. This is a workaround for the incomplete `$<CONFIG>` support in the DEPENDS and OUTPUT clauses of a custom_command/custom_target. Since we can't depend on the per-config rcc output file we somehow must ensure the successful rcc build for one configuration doesn't shadow the need to rcc rebuild for a second configuration. Closes #18006
| * | | Autogen: Add lock file to AUTORCC commandsSebastian Holtermann2018-05-306-9/+62
| | | | | | | | | | | | | | | | | | | | By using a per .qrc lock file in AUTORCC, the same `cmake -E cmake_autorcc ...` command can be called concurrently.
* | | | CMake Nightly Date StampKitware Robot2018-06-011-1/+1
| | | |
* | | | Merge topic 'cpack-wix-sources'Brad King2018-05-311-2/+2
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | ca49f1a8e4 CPack: Fix cross-compilation of WiX generator Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2116
| * | | CPack: Fix cross-compilation of WiX generatorBrad King2018-05-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the case of the path to source files so it works on case-sensitive filesystems. Fixes: #18042
* | | | Merge topic 'revert-windows_symlinks'Brad King2018-05-313-8/+15
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | 83630d4918 cmSystemTools: Revert GetRealPath implementation on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2114
| * | | cmSystemTools: Revert GetRealPath implementation on WindowsBrad King2018-05-293-8/+15
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The use of `uv_fs_realpath` introduced by commit v3.11.0-rc1~445^2~1 (cmSystemTools: Implement GetRealPath on Windows, 2017-10-02) causes `subst` drives to be expanded on Windows, breaking existing use cases. Revert its use until an alternative implementation can be chosen. Preserve the behavior introduced by commit v3.11.0-rc1~445^2 (cmTimestamp: For symlinks switch to timestamp of resolved path, 2017-10-02) by retaining use of `uv_fs_realpath` in a function of a different name. Fixes: #18033 Issue: #17206
| * | CMake 3.11.2v3.11.2Brad King2018-05-171-1/+1
| | |
| * | Merge branch 'custom-command-expand-empty' into release-3.11Brad King2018-05-141-0/+8
| |\ \ | | | | | | | | | | | | Merge-request: !2074
| * \ \ Merge branch 'autogen_register_info_files' into release-3.11Brad King2018-05-141-0/+3
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !2071
| * \ \ \ Merge branch 'restore-imported-lib-alias-diagnostic' into release-3.11Brad King2018-05-101-0/+8
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !2058
| * \ \ \ \ Merge branch 'cxx-checks-tolerate-more-warnings' into release-3.11Brad King2018-04-301-0/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !2019
| * \ \ \ \ \ Merge branch 'backport-ninja-issue-17942' into release-3.11Brad King2018-04-262-1/+9
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2010
* | | | | | | | CMake Nightly Date StampKitware Robot2018-05-311-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'vs-toolset-version'Brad King2018-05-305-0/+118
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5f13168419 VS: Add option to select the version of the toolset used by VS 2017 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Francisco Facioni <fran6co@gmail.com> Merge-request: !2093
| * | | | | | | | VS: Add option to select the version of the toolset used by VS 2017Basil Fierz2018-05-295-0/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new `version=` parameter in the toolset setting to select the version. Add variable `CMAKE_VS_PLATFORM_TOOLSET_VERSION` to hold the version, if one is set (blank indicates default). Fixes: #17549
* | | | | | | | | Merge topic 'cmRemoveDuplicates'Brad King2018-05-302-41/+38
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6d7c074055 cmAlgorithms: Speed up cmRemoveDuplicates method 281f59536f IWYU: Define a macro to tell code it is preprocessing for iwyu Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2101
| * | | | | | | | cmAlgorithms: Speed up cmRemoveDuplicates methodLe Minh Phuc2018-05-252-41/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a hash table instead of a sorted vector to track entries. Co-authored-by: Chu Qinghao <me@qinghao1.com>
* | | | | | | | | CMake Nightly Date StampKitware Robot2018-05-301-1/+1
| | | | | | | | |
* | | | | | | | | Merge topic 'parallel_build_option'Brad King2018-05-2929-100/+358
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1ab3881ec9 cmake: Add options for parallel builds to --build mode Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Henry Schreiner <henryschreineriii@gmail.com> Merge-request: !1962
| * | | | | | | | cmake: Add options for parallel builds to --build modeFlorian Maushart2018-05-2529-100/+358
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While we already support `cmake --build . -- -j`, the options after `--` are specific to the native build tool. Add new options `--parallel [<N>]` and `-j [<N>]` to abstract this and map to the proper option for the native build tool.
* | | | | | | | | Merge topic 'vs-raii-implement'Brad King2018-05-291-130/+42
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e7e25c6cb6 cmVisualStudio10TargetGenerator: Remove empty Elem::EndElement() 726c090297 cmVisualStudio10TargetGenerator: close XML tag in Elem destructor Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2109
| * | | | | | | | | cmVisualStudio10TargetGenerator: Remove empty Elem::EndElement()Vitaly Stakhovsky2018-05-251-125/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The method no longer does anything. Remove it and remove calls to it.
| * | | | | | | | | cmVisualStudio10TargetGenerator: close XML tag in Elem destructorVitaly Stakhovsky2018-05-251-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RAII actually implemented; EndElement() still kept to avoid major reformatting
* | | | | | | | | | CMake Nightly Date StampKitware Robot2018-05-291-1/+1
| | | | | | | | | |
* | | | | | | | | | CMake Nightly Date StampKitware Robot2018-05-281-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge topic 'cmake-D-option-help'Craig Scott2018-05-271-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 42738e5075 Help: Update description of the -D option to CMake Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2105
| * | | | | | | | | | Help: Update description of the -D option to CMakeRaul Laasner2018-05-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #18021