mirrors/cmake
2
0 Fork 0
mirror of https://gitlab.kitware.com/cmake/cmake.git synced 2026-10-02 04:02:23 +03:00
Code Activity
47,352 Commits 2 Branches 414 Tags
94de927cab19609aeeff032c64f16cfd257fca2f
Commit Graph
47352 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Kitware Robot ee4299ce46 CMake Nightly Date Stamp 2020-01-27 00:01:05 -05:00
Marc Chevrier b50b2755da cmComputeLinkInformation: modernize memory management 2020-01-26 14:01:45 +01:00
Kitware Robot 55ea8f6b1b CMake Nightly Date Stamp 2020-01-26 00:01:13 -05:00
Craig Scott b578b00223 Merge topic 'Qt4Macros-last-ext' 
fd83dab339 Qt4Macros: Only cut last extension (".ts") and replace it with ".qm"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4211
 2020-01-25 16:48:15 -05:00
Marc Chevrier 8f839d02e3 cm::String: enhance compatibility with STL 2020-01-25 18:16:16 +01:00
Vitaly Stakhovsky 1398517f31 AppendProperty: convert value param to std::string 2020-01-25 10:37:00 -05:00
Kitware Robot 33e7bd66c0 CMake Nightly Date Stamp 2020-01-25 00:01:08 -05:00
Kyle Edwards 63c9cd2088 Ninja Multi-Config: Fix bug with MacOS frameworks 2020-01-24 17:16:25 -05:00
Robert Maynard e357772f20 CUDAToolkit: Use HINTS as it has higher precedence for searches 2020-01-24 15:31:53 -05:00
Robert Maynard c6ec51c625 CUDAToolkit: functions names now use CMake's reserved namespace 2020-01-24 15:31:36 -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
Sumit Bhardwaj effd4d0569 CSharp: Do not pass definitions with values 
The Microsoft C# tooling does not accept definitions with values.
Filter them out.

Fixes: #19817
 2020-01-24 14:43:37 -05:00
Isuru Fernando 4a62e3d97c macOS: Add OSX_COMPATIBILITY_VERSION and OSX_CURRENT_VERSION properties 
Fixes: #17652
 2020-01-24 14:13:41 -05:00
Koray Kilinc 4a3a7d5f5d CPack/DragNDrop: Fix word corruption in BreakLongLines 
When the lines are wrapped the leading characters of the next word were being lost
 2020-01-24 09:17:12 -08:00
Brad King 08699cec68 add_custom_command: Fix dependency on macOS framework target 
When the `DEPENDS` option names a logical target name, convert to the
"real" path of that target rather than any of the symlink-provided
alternative file names.  This makes the dependencies consistent with the
outputs named by link rules producing the target artifacts.

Fixes: #20264
 2020-01-24 11:29:45 -05:00
Kyle Edwards 9d0f61839b CheckLanguage: Pass CMAKE_MAKE_PROGRAM to child process 
Fixes: #20017
 2020-01-24 11:23:04 -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
Andrew Fuller 9571929701 CPack/DragNDrop: Support RTF licenses 2020-01-24 07:48:52 -08:00
Paweł Bylica fbd3ea2047 FindGTest: Add GTest::{gtest,gtest_main} library names 
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
 2020-01-24 10:18:36 -05:00
Marc Chevrier 73d1da4f86 Stl support: cm::append now supports any sequential container 2020-01-24 15:55:32 +01: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
Ben Boeckel 879e56f336 makefiles: suppress RCS and SCCS implicit rules 
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.
 2020-01-24 09:06:25 -05:00
Kyle Edwards baec299ecd CPack: Fix regression in Deb description 
Fixes: #20254
 2020-01-24 08:50:43 -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
Kai Blaschke fd83dab339 Qt4Macros: Only cut last extension (".ts") and replace it with ".qm" 2020-01-24 07:55:53 +11: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