summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* CMake 3.12.1v3.12.1Brad King2018-08-091-1/+1
|
* Merge branch 'project-injected-no-cmp0048' into release-3.12Craig Scott2018-07-252-2/+9
|\
| * project: Do not issue CMP0048 warnings on injected callBrad King2018-07-242-2/+9
| | | | | | | | Fixes: #18202
* | Help: Add explicit <PackageName>_ROOT variable documentationBrad King2018-07-201-2/+2
|/ | | | | | Add documentation for both the CMake variable and environment variable of this name pattern. Update references to these names to link to their documents. Clarify the pattern used to construct their names.
* CMake 3.12.0v3.12.0Brad King2018-07-171-1/+1
|
* CMake 3.12.0-rc3v3.12.0-rc3Brad King2018-07-091-1/+1
|
* Merge branch 'csharp-link-file' into release-3.12Brad King2018-07-091-4/+7
|\ | | | | | | Merge-request: !2177
| * VS: Only link cs files when they're not in binary dirRobert Dailey2018-07-061-4/+7
| | | | | | | | | | | | When `*.cs` files are provided, do not generate a `<Link>` element in the `.csproj` project if those files are descendants of `CMAKE_CURRENT_BINARY_DIR`. This comparison happens for each file.
* | Merge branch 'revert-subdirectory-linking' into release-3.12Brad King2018-07-031-9/+2
|\ \ | |/ |/| | | Merge-request: !2191
| * Revert "target_link_libraries: Allow use with targets in other directories"Brad King2018-07-031-9/+2
| | | | | | | | | | | | | | | | | | Revert commit v3.12.0-rc1~82^2 (target_link_libraries: Allow use with targets in other directories, 2018-05-11). The RHS target scoping and visibility rules are not clear and will need further investigation before the feature can be added. Issue: #17943
* | 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
| | | |