reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2024-12-03 00:57:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
46,560 Commits 4 Branches 185 Tags 113 MiB
0944caaebb
Commit Graph

46560 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
0944caaebb Tests: Fix RunCMake.CMP0037 test with Ninja 1.10 
The CMP0037 OLD and WARN cases that actually use reserved target names
like `all` produce `build.ninja` files with duplicate build statements
producing the same output.  With Ninja 1.10 and above we run ninja
tools at the end of generation that require `build.ninja` to be loadable.
It is not loadable for these test cases, so skip them.
 2020-01-27 13:26:40 -05:00
Brad King
9d4883cce5 Tests: Fix RunCMake.Ninja test for Ninja 1.10 
With Ninja 1.10 we run the cleandead and recompact tools after
generation.  These require that `build.ninja` be loadable.  Update the
`CustomCommandJobPool` case to define the referenced job pools to make
`build.ninja` loadable.
 2020-01-27 13:26:40 -05:00
Brad King
f624b44524 Merge topic 'fix-ninja-multi-framework-header' 
63c9cd2088 Ninja Multi-Config: Fix bug with MacOS frameworks

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4279
 2020-01-27 10:06:53 -05:00
Brad King
306328ace8 Merge topic 'depend-on-target-real-name' 
08699cec68 add_custom_command: Fix dependency on macOS framework target

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4273
 2020-01-27 10:04:08 -05:00
Brad King
0bf9589bf1 Merge topic 'csharp-no-valued-macros' 
effd4d0569 CSharp: Do not pass definitions with values

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4267
 2020-01-27 10:03:26 -05:00
Brad King
fd6c1d99e3 Merge topic 'check-language-make-program' 
9d0f61839b CheckLanguage: Pass CMAKE_MAKE_PROGRAM to child process

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4272
 2020-01-27 09:35:14 -05:00
Brad King
6f7f293562 Merge topic 'cpack-dmg-breaklongline' 
4a3a7d5f5d CPack/DragNDrop: Fix word corruption in BreakLongLines

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4275
 2020-01-27 09:33:45 -05:00
Brad King
d5f5496783 Merge topic 'cpack-dmg-rtf-for-sla' 
9571929701 CPack/DragNDrop: Support RTF licenses

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4270
 2020-01-27 09:32:51 -05:00
Brad King
647ff12ca6 Merge topic 'stl-support' 
73d1da4f86 Stl support: cm::append now supports any sequential container

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4251
 2020-01-27 09:31:22 -05:00
Brad King
a9a1a7a325 Merge topic 'makefiles-suppress-vcs-implicit-rules' 
879e56f336 makefiles: suppress RCS and SCCS implicit rules

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4264
 2020-01-27 09:29:58 -05:00
Brad King
e0a288b0ff Merge topic 'FindGTest-upstream-lib-names' 
fbd3ea2047 FindGTest: Add GTest::{gtest,gtest_main} library names

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4268
 2020-01-27 09:29:10 -05:00
Brad King
b13a446ed0 Merge branch 'release-3.16' 2020-01-27 09:27:37 -05:00
Brad King
64e3bb4aee Merge topic 'cpack-deb-fix-description' 
baec299ecd CPack: Fix regression in Deb description

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4271
 2020-01-27 09:27:36 -05:00
Brad King
89ed119c0f Merge topic 'cpack-deb-fix-description' into release-3.16 
baec299ecd CPack: Fix regression in Deb description

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4271
 2020-01-27 09:27:36 -05:00
Kitware Robot
ee4299ce46 CMake Nightly Date Stamp 2020-01-27 00:01:05 -05: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
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
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
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