summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | makefiles: suppress RCS and SCCS implicit rulesBen Boeckel2020-01-241-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are not suffix rules and are not suppressed by the empty `.SUFFIXES` recipe. Additionally, the old `SUFFIXES =` code didn't actually accomplish this, so remove it.
* | | | | | | | | | | | | | Merge topic 'FindGTest-upstream-lib-names'Brad King2020-01-272-0/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fbd3ea2047 FindGTest: Add GTest::{gtest,gtest_main} library names Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4268
| * | | | | | | | | | | | | | FindGTest: Add GTest::{gtest,gtest_main} library namesPaweł Bylica2020-01-242-0/+15
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This introduces 2 new INTERFACE IMPORTED libraries: GTest::gtest and GTest::gtest_main. They link to GTest::GTest and GTest::Main targets respectively, therefore working as aliases. These new names map the names of the targets from upstream GTest's CMake package config. Fixes: #20255
* | | | | | | | | | | | | | Merge branch 'release-3.16'Brad King2020-01-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge topic 'cpack-deb-fix-description' into release-3.16Brad King2020-01-276-9/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | baec299ecd CPack: Fix regression in Deb description Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4271
* | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge topic 'cpack-deb-fix-description'Brad King2020-01-276-9/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | baec299ecd CPack: Fix regression in Deb description Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4271
| * | | | | | | | | | | | | | CPack: Fix regression in Deb descriptionKyle Edwards2020-01-246-9/+20
| |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20254
* | | | | | | | | | | | | | CMake Nightly Date StampKitware Robot2020-01-271-1/+1
| |_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | CMake Nightly Date StampKitware Robot2020-01-261-1/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge topic 'Qt4Macros-last-ext'Craig Scott2020-01-251-5/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fd83dab339 Qt4Macros: Only cut last extension (".ts") and replace it with ".qm" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4211
| * | | | | | | | | | | | Qt4Macros: Only cut last extension (".ts") and replace it with ".qm"Kai Blaschke2020-01-231-5/+7
| | | | | | | | | | | | |
* | | | | | | | | | | | | CMake Nightly Date StampKitware Robot2020-01-251-1/+1
| |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge topic 'ninja-multi-cross-configs'Brad King2020-01-2421-14/+455
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b7a2baf38c Ninja Multi-Config: Add variable to control configs used in cross-config build Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4269
| * | | | | | | | | | | Ninja Multi-Config: Add variable to control configs used in cross-config buildKyle Edwards2020-01-2321-14/+455
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge topic 'vs-dotnet-standard-core'Brad King2020-01-2418-23/+216
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ae1e1909a1 VS: Add support for .NET Standard and .NET Core Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4240
| * | | | | | | | | | VS: Add support for .NET Standard and .NET CoreJoerg Bornemann2020-01-2418-23/+216
| | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20105
* | | | | | | | | | Merge topic 'findCUDAToolkit_support_cross_compilation'Brad King2020-01-241-5/+45
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 48bd2e0630 CUDAToolkit: Make sure to also search 'stubs' directory 69fcad9332 CUDAToolkit: Add support for cross-compiling Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4253
| * | | | | | | | | | CUDAToolkit: Make sure to also search 'stubs' directoryRobert Maynard2020-01-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #20252
| * | | | | | | | | | CUDAToolkit: Add support for cross-compilingRobert Maynard2020-01-231-3/+43
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CUDAToolkit now searches the correct targets folder based on what platform we are cross-compiling for. Fixes: #20232
* | | | | | | | | | Merge topic 'trace_json_timestamp'Brad King2020-01-243-7/+22
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c829f0cfca trace: Add time and stack level to JSON output format Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Volo Zyko <volo.zyko@gmail.com> Merge-request: !4242
| * | | | | | | | | | trace: Add time and stack level to JSON output formatFrank Winklmeier2020-01-223-7/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the timestamp and stack depth of the function call to the JSON trace output format. This information can be useful for cmake profiling and call stack inspection (see e.g. https://github.com/volo-zyko/cmake-profile-stats). Improve unit test to allow for varying set of keys to check in trace lines.
* | | | | | | | | | | Merge topic 'multi-ninja-no-cleandead'Brad King2020-01-241-2/+11
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6cc74b6140 cmGlobalNinjaGenerator: avoid cleandead and recompact in Ninja-Multi Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4261
| * | | | | | | | | | | cmGlobalNinjaGenerator: avoid cleandead and recompact in Ninja-MultiBen Boeckel2020-01-231-2/+11
| | |_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20247
* | | | | | | | | | | Merge topic 'fphsa-no-regexp'Brad King2020-01-241-2/+4
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 31144f85af FPHSA: Check _FOUND var name with STREQUAL Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4266
| * | | | | | | | | | | FPHSA: Check _FOUND var name with STREQUALFeRD (Frank Dana)2020-01-241-2/+4
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using MATCHES "^${_Name}_FOUND$" limits the name of the found variable, since it can't contain any regular expression special-chars (period, plus sign, etc.)
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2020-01-241-1/+1
| |_|/ / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge topic 'organize_makefile_help_output'Kyle Edwards2020-01-231-8/+23
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7c1470f146 Makefiles: Organize help output to group 'like' targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4260
| * | | | | | | | | | Makefiles: Organize help output to group 'like' targetsRobert Maynard2020-01-221-8/+23
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'release-3.16'Brad King2020-01-230-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge topic 'get-runtime-dependencies-keyword-args' into release-3.16Brad King2020-01-233-5/+34
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4c8a917a87 file(GET_RUNTIME_DEPENDENCIES): Tolerate empty list arguments Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4262
* | \ \ \ \ \ \ \ \ \ \ Merge topic 'get-runtime-dependencies-keyword-args'Brad King2020-01-233-5/+35
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3573f62a16 Merge branch 'backport-get-runtime-dependencies-keyword-args' c998c8d560 file(GET_RUNTIME_DEPENDENCIES): Tolerate empty list arguments 4c8a917a87 file(GET_RUNTIME_DEPENDENCIES): Tolerate empty list arguments Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4262
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'backport-get-runtime-dependencies-keyword-args'Brad King2020-01-220-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | file(GET_RUNTIME_DEPENDENCIES): Tolerate empty list argumentsKyle Edwards2020-01-223-5/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also list all keywords that were missing values instead of only the first one.
| * | | | | | | | | | | | 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 branch 'release-3.16'Brad King2020-01-230-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge topic 'findmpi-documentation' into release-3.16Brad King2020-01-231-5/+17
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 95a501addb Help: Add more variable documentation to FindMPI Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4263
* | | | | | | | | | | | Merge topic 'findmpi-documentation'Brad King2020-01-231-5/+17
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 95a501addb Help: Add more variable documentation to FindMPI Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4263
| * | | | | | | | | | | Help: Add more variable documentation to FindMPIKyle Edwards2020-01-221-5/+17
| |/ / / / / / / / / /
* | | | | | | | | | | Merge topic 'ninja-multi-default-build-alias'Brad King2020-01-2319-73/+494
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8337ed0d73 Ninja Multi-Config: Add variable to control aliases in build.ninja 110037369d Refactor: Split Ninja files into impl-<Config>.ninja and build-<Config>.ninja e62a3414f7 Refactor: Move common.ninja into CMakeFiles Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4238
| * | | | | | | | | | | Ninja Multi-Config: Add variable to control aliases in build.ninjaKyle Edwards2020-01-2210-14/+192
| | | | | | | | | | | |
| * | | | | | | | | | | Refactor: Split Ninja files into impl-<Config>.ninja and build-<Config>.ninjaKyle Edwards2020-01-2212-66/+308
| | | | | | | | | | | |
| * | | | | | | | | | | Refactor: Move common.ninja into CMakeFilesKyle Edwards2020-01-221-1/+2
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge topic 'blas-lapack-whitespace'Brad King2020-01-232-526/+536
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | beb2bbd5b5 Find{BLAS,LAPACK}: Cleanup whitespace, style, and comments 972c2cc7ca FindLAPACK: Fixed order of arguments for internal helper macro 7346a3226f Find{BLAS,LAPACK}: Clarify names of internal helper macro Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4243
| * | | | | | | | | | | Find{BLAS,LAPACK}: Cleanup whitespace, style, and commentsMario Emmenlauer2020-01-212-499/+509
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring whitespace and code style up to date in these scripts. Both scripts share the same origin but have diverged over time, so synchronize them again. This is relevant because BLAS and LAPACK detection is often performed simultaneously, so both scripts should evolve in sync. While at it, update a few comments. This update is intended to have no functional changes.
| * | | | | | | | | | | FindLAPACK: Fixed order of arguments for internal helper macroMario Emmenlauer2020-01-211-9/+9
| | | | | | | | | | | |
| * | | | | | | | | | | Find{BLAS,LAPACK}: Clarify names of internal helper macroMario Emmenlauer2020-01-202-35/+35
| | |_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also clarify names of their arguments.
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2020-01-231-1/+1
| |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | 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