summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* CPack/Deb: Restore setting of root as the owner of filesAndrew Fuller2018-07-021-0/+6
| | | | | | Refactoring in commit v3.10.0-rc1~220^2 (cmCPackDebGenerator: Use libarchive to create .deb file) accidentally broke this for the top-level archive.
* CMake 3.12.0-rc2v3.12.0-rc2Brad King2018-06-291-1/+1
|
* Merge branch 'ctest_submit-https' into release-3.12Brad King2018-06-272-3/+5
|\ | | | | | | Merge-request: !2171
| * ctest_submit: show headers as debug infoZack Galbreath2018-06-272-3/+3
| | | | | | | | | | | | | | Hide any headers specified by `ctest_submit(HTTPHEADER ...)` unless ctest is run with --debug. This option is used to present bearer tokens to CDash. We do not want to inadvertently expose this secret data in the console output log.
| * ctest_submit: Check CA file during CDASH_UPLOADZack Galbreath2018-06-271-0/+2
| | | | | | | | | | | | | | This fixes a bug where ctest(SUBMIT CDASH_UPLOAD ...) would fail when attemping to submit to a site bearing a genuine SSL certificate. This code path was missing a call to cmCurlSetCAInfo() which loads the certificate authority file.
* | Merge branch 'lexer-null' into release-3.12Brad King2018-06-262-103/+99
|\ \ | | | | | | | | | Merge-request: !2174
| * | ListFileLexer: Do not match null bytes in inputBrad King2018-06-262-103/+99
| |/ | | | | | | | | | | | | | | | | | | | | Extend the fix from commit v3.10.0-rc1~188^2 (ListFileLexer: fix heap-buffer-overflow on malicious input, 2017-08-26) to apply to all lexer token matches. Replace all `.` with `[^\0\n]`. Update all `[^...]` match expressions to not match `\0`. We cannot safely process null bytes in strings. Fixes: #18124
* | Merge branch 'libuv-new-version-file-location' into release-3.12Brad King2018-06-251-0/+2
|\ \ | | | | | | | | | Merge-request: !2169
| * | FindLibUV: Also check uv/version.h for version detectionRaphael Kubo da Costa2018-06-251-0/+2
| |/ | | | | | | | | Starting with libuv 1.21.0, libuv's headers were moved into a uv/ directory. Make FindLibUV aware of the file's new location for configuration to work.
* | Merge branch 'vs-filter-default-toolset' into release-3.12Brad King2018-06-256-27/+73
|\ \ | | | | | | | | | Merge-request: !2162
| * | VS: Allow toolset version selection to specify default toolsetBasil Fierz2018-06-244-18/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach the feature added by commit v3.12.0-rc1~38^2 (VS: Add option to select the version of the toolset used by VS 2017, 2018-05-19) to accept the default toolset version in addition to older versions. If the default toolset version is supplied, simply clear it so the default will be used. Fixes: #18107
| * | cmVSSetupHelper: Expose default toolset versionBasil Fierz2018-06-222-0/+15
| | | | | | | | | | | | We already detect the VS toolset version. Expose it to clients.
| * | cmVSSetupHelper: Use in-class member initializationBrad King2018-06-221-9/+4
| |/
* | Merge branch 'file-GLOB-remove-new-errors' into release-3.12Brad King2018-06-221-17/+11
|\ \ | | | | | | | | | Merge-request: !2164
| * | file: Drop error cases added by CMake 3.12.0-rc1 to avoid regressionsBrad King2018-06-221-17/+11
| |/ | | | | | | | | | | | | | | | | Refactoring in commit v3.12.0-rc1~418^2~3 (Refactor HandleGlobCommand, 2018-02-13) introduced error diagnostics for argument combinations that were previously accepted. Restore acceptance to avoid regressing projects that used those combinations even if they do not make sense. Fixes: #18097
* | Merge branch 'vs-cuda-no-host-includes' into release-3.12Brad King2018-06-201-0/+1
|\ \ | | | | | | | | | Merge-request: !2158
| * | VS: Avoid duplication of CUDA include directoriesBrad King2018-06-201-0/+1
| |/ | | | | | | | | | | | | | | We already place all include directories for CUDA inside `CudaCompile` so we do not need to use any from `ClCompile`. Tell `CudaCompile` not to use the host compiler's include directory settings. Fixes: #18101
* | Merge branch 'vs-cuda-maxrregcount' into release-3.12Brad King2018-06-201-0/+3
|\ \ | | | | | | | | | Merge-request: !2156
| * | VS: Add CUDA flag table entry for -maxrregcountBrad King2018-06-201-0/+3
| |/ | | | | | | Fixes: #18104
* | C++ feature checks: Ignore Xcode warningsGregor Jasny2018-06-191-0/+2
| |
* | Xcode: Use legacy build systemGregor Jasny2018-06-192-12/+25
| | | | | | | | Closes: #18099
* | Xcode: Detect architecture(s) using ARCHS instead of CURRENT_ARCHBrad King2018-06-181-1/+6
|/ | | | | | | | | Xcode 10 no longer populates `CURRENT_ARCH` with the current architecture in shell scripts and instead uses `undefined_arch`. Instead we must use `ARCHS`. It lists all architectures separated by spaces. Fixes: #18085
* 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