mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-21 05:38:24 -05:00
Code Issues Packages Projects Releases Wiki Activity
46,532 Commits 2 Branches 399 Tags
63c9cd2088cc1287e4d4cd858bbdb8ca88dd8313
Commit Graph

46532 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kyle Edwards 63c9cd2088 Ninja Multi-Config: Fix bug with MacOS frameworks 2020-01-24 17:16:25 -05:00
Brad King 072a95350c Merge topic 'ninja-multi-cross-configs' 
b7a2baf38c Ninja Multi-Config: Add variable to control configs used in cross-config build

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4269
 2020-01-24 15:02:20 -05:00
Brad King 786b56942b Merge topic 'vs-dotnet-standard-core' 
ae1e1909a1 VS: Add support for .NET Standard and .NET Core

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4240
 2020-01-24 10:55:26 -05:00
Brad King 4dbc9dfc7a Merge topic 'findCUDAToolkit_support_cross_compilation' 
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
 2020-01-24 09:22:12 -05:00
Brad King 816bbf227f Merge topic 'trace_json_timestamp' 
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
 2020-01-24 09:19:55 -05:00
Brad King 89a93348d5 Merge topic 'multi-ninja-no-cleandead' 
6cc74b6140 cmGlobalNinjaGenerator: avoid cleandead and recompact in Ninja-Multi

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4261
 2020-01-24 09:17:07 -05:00
Brad King 1397b3d26e Merge topic 'fphsa-no-regexp' 
31144f85af FPHSA: Check _FOUND var name with STREQUAL

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4266
 2020-01-24 09:16:19 -05:00
Joerg Bornemann ae1e1909a1 VS: Add support for .NET Standard and .NET Core 
Fixes: #20105
 2020-01-24 09:11:05 -05:00
Kitware Robot 55921df313 CMake Nightly Date Stamp 2020-01-24 00:01:06 -05:00
FeRD (Frank Dana) 31144f85af FPHSA: Check _FOUND var name with STREQUAL 
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.)
 2020-01-23 20:26:05 -05:00
Kyle Edwards b7a2baf38c Ninja Multi-Config: Add variable to control configs used in cross-config build 2020-01-23 15:47:12 -05:00
Robert Maynard 48bd2e0630 CUDAToolkit: Make sure to also search 'stubs' directory 
Fixes #20252
 2020-01-23 13:07:21 -05:00
Robert Maynard 69fcad9332 CUDAToolkit: Add support for cross-compiling 
CUDAToolkit now searches the correct targets folder based on
what platform we are cross-compiling for.

Fixes: #20232
 2020-01-23 12:51:29 -05:00
Kyle Edwards ab2fc91821 Merge topic 'organize_makefile_help_output' 
7c1470f146 Makefiles: Organize help output to group 'like' targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4260
 2020-01-23 10:43:03 -05:00
Brad King b74ed6fcf3 Merge branch 'release-3.16' 2020-01-23 10:02:45 -05:00
Brad King f0f7ea2bf5 Merge topic 'get-runtime-dependencies-keyword-args' 
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
 2020-01-23 10:02:45 -05:00
Brad King 7458892522 Merge topic 'get-runtime-dependencies-keyword-args' into release-3.16 
4c8a917a87 file(GET_RUNTIME_DEPENDENCIES): Tolerate empty list arguments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4262
 2020-01-23 10:02:44 -05:00
Brad King 59dbb2e79b Merge branch 'release-3.16' 2020-01-23 10:01:57 -05:00
Brad King 7cc74a59f3 Merge topic 'findmpi-documentation' 
95a501addb Help: Add more variable documentation to FindMPI

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4263
 2020-01-23 10:01:57 -05:00
Brad King 70adbc0c3e Merge topic 'findmpi-documentation' into release-3.16 
95a501addb Help: Add more variable documentation to FindMPI

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4263
 2020-01-23 10:01:56 -05:00
Brad King 9771d231aa Merge topic 'ninja-multi-default-build-alias' 
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
 2020-01-23 10:01:14 -05:00
Brad King 6638fa4ad6 Merge topic 'blas-lapack-whitespace' 
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
 2020-01-23 10:00:13 -05:00
Ben Boeckel 6cc74b6140 cmGlobalNinjaGenerator: avoid cleandead and recompact in Ninja-Multi 
Fixes: #20247
 2020-01-23 09:24:46 -05:00
Kitware Robot 9c87d051ad CMake Nightly Date Stamp 2020-01-23 00:01:09 -05:00
Kyle Edwards 95a501addb Help: Add more variable documentation to FindMPI 2020-01-22 14:46:09 -05:00
Brad King 3573f62a16 Merge branch 'backport-get-runtime-dependencies-keyword-args' 2020-01-22 14:34:47 -05:00
Kyle Edwards c998c8d560 file(GET_RUNTIME_DEPENDENCIES): Tolerate empty list arguments 
Also list all keywords that were missing values instead of only the
first one.
 2020-01-22 14:34:33 -05:00
Robert Maynard 7c1470f146 Makefiles: Organize help output to group 'like' targets 2020-01-22 13:21:12 -05:00
Kyle Edwards 4c8a917a87 file(GET_RUNTIME_DEPENDENCIES): Tolerate empty list arguments 
Also list all keywords that were missing values instead of only the
first one.
 2020-01-22 13:05:46 -05:00
Kyle Edwards 8337ed0d73 Ninja Multi-Config: Add variable to control aliases in build.ninja 2020-01-22 10:26:21 -05:00
Kyle Edwards 110037369d Refactor: Split Ninja files into impl-<Config>.ninja and build-<Config>.ninja 2020-01-22 10:26:21 -05:00
Kyle Edwards e62a3414f7 Refactor: Move common.ninja into CMakeFiles 2020-01-22 10:25:35 -05:00
Kyle Edwards 593d0f3a57 Merge topic 'ninja-restat-just-build.ninja' 
eb2da206d9 cmGlobalNinjaGenerator: only restat build.ninja

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4245
 2020-01-22 10:25:06 -05:00
Frank Winklmeier c829f0cfca trace: Add time and stack level to JSON output format 
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.
 2020-01-22 09:58:52 -05:00
Brad King 15c573df41 Merge topic 'mark_as_advanced-without-cache' 
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
 2020-01-22 09:50:49 -05:00
Brad King 39695f6fb3 Merge topic 'modernize-memory-management' 
edab5add57 cmMakefileTargetGenerator: modernize memory management

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4250
 2020-01-22 09:49:30 -05:00
Brad King fad5716c2a Merge topic 'test-file-download' 
65a3c68259 Tests: Make CMake.FileDownload invalid host name case more robust

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4252
 2020-01-22 09:48:40 -05:00
Brad King 3be2abd889 Merge topic 'install-std-string' 
5e54b0cf2f cmInstallGenerator: std::string params

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4255
 2020-01-22 09:40:32 -05:00
Brad King fbd20759be Merge topic 'FindMPI-fix-return' 
8217a26d29 FindMPI: Fix regression when compiling with MPI wrappers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4254
 2020-01-22 09:30:53 -05:00
Brad King 3f601ebb0a Merge topic 'vs-std-string' 
2e768924f3 cmLocalVisualStudio7Generator: clean up c_str()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4249
 2020-01-22 09:24:57 -05:00
Brad King 352545666e Merge branch 'release-3.15' 2020-01-22 09:22:58 -05:00
Brad King a723ba489c Merge branch 'release-3.16' 2020-01-22 09:17:42 -05:00
Brad King 39c357b9c4 Merge topic 'msvc-runtime-library-masm' into release-3.16 
1421005835 ASM_MASM: Populate MSVC runtime library abstraction table

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4257
 2020-01-22 09:17:41 -05:00
Brad King 2bca519eca Merge topic 'msvc-runtime-library-masm' 
1421005835 ASM_MASM: Populate MSVC runtime library abstraction table

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4257
 2020-01-22 09:17:41 -05:00
Kitware Robot 0877438599 CMake Nightly Date Stamp 2020-01-22 00:01:07 -05:00
Mario Emmenlauer beb2bbd5b5 Find{BLAS,LAPACK}: Cleanup whitespace, style, and comments 
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.
 2020-01-21 22:55:17 +01:00
Mario Emmenlauer 972c2cc7ca FindLAPACK: Fixed order of arguments for internal helper macro 2020-01-21 22:54:15 +01:00
Brad King 99e1be5d43 Merge branch 'msvc-runtime-library-masm' into release-3.15 
Merge-request: !4257
 2020-01-21 12:55:36 -05:00
Brad King 1421005835 ASM_MASM: Populate MSVC runtime library abstraction table 
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
 2020-01-21 12:54:50 -05:00
Brad King f45b2c4812 Merge topic 'FindGTK2-doc' 
763beb5944 FindGTK2: Fix documentation formatting

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4256
 2020-01-21 12:39:00 -05:00