summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* file(GET_RUNTIME_DEPENDENCIES): Tolerate empty list argumentsKyle Edwards2020-01-223-5/+35
| | | | | Also list all keywords that were missing values instead of only the first one.
* Merge topic 'ninja-restat-just-build.ninja'Kyle Edwards2020-01-221-5/+19
|\ | | | | | | | | | | | | eb2da206d9 cmGlobalNinjaGenerator: only restat build.ninja Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4245
| * cmGlobalNinjaGenerator: only restat build.ninjaBen Boeckel2020-01-211-5/+19
| | | | | | | | This reduces the work that ninja needs to do on a CMake reconfigure.
* | Merge topic 'mark_as_advanced-without-cache'Brad King2020-01-2224-59/+264
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3ec82b713e cmMarkAsAdvancedCommand: ignore variables which don't exist in the cache 701a5c60e0 cmake: avoid marking local or unused variables as advanced af158149e7 FindOpenSSL: do not mark a local variable as advanced 74f659f1f2 FindCurses: only mark CURSES_EXTRA_LIBRARY when it is used 7e2ae4e96d FindOpenGL: only mark declared cache variables as advanced 7cc02a0c29 FindLua: only mark LUA_MATH_LIBRARY as advanced if required 85cd26b8a6 FindBoost: only mark Boost_DIR as advanced if defined 338c7916ba CTest: avoid marking undeclared cache variables as advanced ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4150
| * | cmMarkAsAdvancedCommand: ignore variables which don't exist in the cacheBen Boeckel2020-01-2015-6/+182
| | | | | | | | | | | | Fixes: #18331
| * | cmake: avoid marking local or unused variables as advancedBen Boeckel2020-01-202-2/+0
| | |
| * | FindOpenSSL: do not mark a local variable as advancedBen Boeckel2020-01-201-1/+1
| | |
| * | FindCurses: only mark CURSES_EXTRA_LIBRARY when it is usedBen Boeckel2020-01-201-1/+4
| | |
| * | FindOpenGL: only mark declared cache variables as advancedBen Boeckel2020-01-201-11/+32
| | |
| * | FindLua: only mark LUA_MATH_LIBRARY as advanced if requiredBen Boeckel2020-01-141-1/+2
| | |
| * | FindBoost: only mark Boost_DIR as advanced if definedBen Boeckel2020-01-141-1/+4
| | |
| * | CTest: avoid marking undeclared cache variables as advancedBen Boeckel2020-01-141-4/+0
| | |
| * | CPack: mark options as advanced only if definedBen Boeckel2020-01-141-32/+39
| | |
* | | Merge topic 'modernize-memory-management'Brad King2020-01-222-33/+31
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | edab5add57 cmMakefileTargetGenerator: modernize memory management Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4250
| * | | cmMakefileTargetGenerator: modernize memory managementMarc Chevrier2020-01-212-33/+31
| | | |
* | | | Merge topic 'test-file-download'Brad King2020-01-221-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 65a3c68259 Tests: Make CMake.FileDownload invalid host name case more robust Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4252
| * | | | Tests: Make CMake.FileDownload invalid host name case more robustBrad King2020-01-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a well-defined `.invalid` top-level domain instead of assuming there is no `.png` top-level domain. Extend the timeout of this one case to 30 seconds to give DNS lookups a chance to fail instead of timing out.
* | | | | Merge topic 'install-std-string'Brad King2020-01-2213-42/+44
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5e54b0cf2f cmInstallGenerator: std::string params Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4255
| * | | | | cmInstallGenerator: std::string paramsVitaly Stakhovsky2020-01-2113-42/+44
| |/ / / / | | | | | | | | | | | | | | | | | | | | Several construction parameters converted to std::string Also made a few class members const
* | | | | Merge topic 'FindMPI-fix-return'Brad King2020-01-221-4/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8217a26d29 FindMPI: Fix regression when compiling with MPI wrappers Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4254
| * | | | | FindMPI: Fix regression when compiling with MPI wrappersBrad King2020-01-211-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit 5861c6d450 (FindMPI: Preserve include order when extracting component directories, 2019-12-19) converted a CMake-language function to a macro. However, it contains a `return()` call that now applies in the caller's scope, which is in correct. The `return()` is meant to skip work when using a MPI compiler wrapper as the main compiler. Move that condition to the call site instead. Fixes: #20234
* | | | | | Merge topic 'vs-std-string'Brad King2020-01-222-50/+45
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2e768924f3 cmLocalVisualStudio7Generator: clean up c_str() Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4249
| * | | | | | cmLocalVisualStudio7Generator: clean up c_str()Vitaly Stakhovsky2020-01-202-50/+45
| | | | | | |
* | | | | | | Merge branch 'release-3.15'Brad King2020-01-220-0/+0
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'msvc-runtime-library-masm' into release-3.15Brad King2020-01-211-0/+6
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !4257
* | \ \ \ \ \ \ \ Merge branch 'release-3.16'Brad King2020-01-220-0/+0
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge topic 'msvc-runtime-library-masm' into release-3.16Brad King2020-01-221-0/+6
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1421005835 ASM_MASM: Populate MSVC runtime library abstraction table Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4257
* | | | | | | | | | Merge topic 'msvc-runtime-library-masm'Brad King2020-01-221-0/+6
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1421005835 ASM_MASM: Populate MSVC runtime library abstraction table Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4257
| * | | | | | | | | ASM_MASM: Populate MSVC runtime library abstraction tableBrad King2020-01-211-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit fb3370b6a1 (MSVC: Add abstraction for runtime library selection, 2019-04-10, v3.15.0-rc1~229^2) we overlooked populating the runtime library selection flags for the Microsoft assembler. It does not actually have any such flags, but since its compiler id is `MSVC` our generators expect the table to be populated. Use empty values. Without this fix, enabling the `ASM_MASM` language with policy `CMP0091` set to `NEW` causes an error due to the missing table entries. Fixes: #20236, #19453
* | | | | | | | | | CMake Nightly Date StampKitware Robot2020-01-221-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge topic 'FindGTK2-doc'Brad King2020-01-211-65/+52
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 763beb5944 FindGTK2: Fix documentation formatting Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4256
| * | | | | | | | | | FindGTK2: Fix documentation formattingBrad King2020-01-211-65/+52
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20223
* | | | | | | | | | Merge branch 'release-3.16'Brad King2020-01-210-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | CMake 3.16.3v3.16.3Brad King2020-01-211-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge topic 'mingw-find-no-dll'Brad King2020-01-213-2/+8
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | afbbfe5109 MinGW: Update find_library to not find plain .dll files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4248
| * | | | | | | | | MinGW: Update find_library to not find plain .dll filesBrad King2020-01-203-2/+8
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modern distributions of packages built with MinGW tools provide `.dll.a` import libraries. Prefer those instead of finding plain `.dll` files. This avoids accidentally finding unrelated Windows `.dll` files. Fixes: #20019
* | | | | | | | | Merge topic 'install-std-string'Brad King2020-01-2117-119/+122
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9db532f44d cmInstall*Generator: std::string params Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4241
| * | | | | | | | | cmInstall*Generator: std::string paramsVitaly Stakhovsky2020-01-2117-119/+122
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Several construction parameters converted to std::string Also made a few class members const
* | | | | | | | | Merge branch 'release-3.15'Brad King2020-01-210-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'InstallRequiredSystemLibraries-redist' into release-3.15Brad King2020-01-201-6/+20
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !4247
* | \ \ \ \ \ \ \ \ Merge branch 'release-3.16'Brad King2020-01-210-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge topic 'InstallRequiredSystemLibraries-redist' into release-3.16Brad King2020-01-211-6/+20
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7ca923bcaf IRSL: Install msvcp140_{1,2,codecvt_ids}.dll if available Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Andrey Vihrov <andrey.vihrov@gmail.com> Merge-request: !4247
* | | | | | | | | | Merge topic 'InstallRequiredSystemLibraries-redist'Brad King2020-01-211-6/+20
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | / / / | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7ca923bcaf IRSL: Install msvcp140_{1,2,codecvt_ids}.dll if available Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Andrey Vihrov <andrey.vihrov@gmail.com> Merge-request: !4247
| * | | | | | | | IRSL: Install msvcp140_{1,2,codecvt_ids}.dll if availableBrad King2020-01-201-6/+20
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VS now distributes these additional runtime libraries. Install them if available. Fixes: #20228
* | | | | | | | CMake Nightly Date StampKitware Robot2020-01-211-1/+1
| |_|_|/ / / / |/| | | | | |
* | | | | | | Merge topic 'multi-ninja-pch'Brad King2020-01-2013-133/+192
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a55df20499 Multi-Ninja: Add precompile headers support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4201
| * | | | | | | Multi-Ninja: Add precompile headers supportCristian Adam2020-01-1713-133/+192
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #19789
* | | | | | | | Merge topic 'realpath-cache'Brad King2020-01-203-2/+17
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9d5a554cc9 cmGlobalGenerator: Add cache for realpath() results Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4220
| * | | | | | | | cmGlobalGenerator: Add cache for realpath() resultsTim Blechmann2020-01-163-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cache the results of `realpath()` system calls in `cmGlobalGenerator` to avoid repeating such calls for the same paths over and over.
* | | | | | | | | Merge branch 'release-3.16'Brad King2020-01-200-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |