mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-22 15:10:20 -06:00
Code Issues Packages Projects Releases Wiki Activity
46,538 Commits 2 Branches 391 Tags
64e3bb4aeed03ec1426c67620e08fa69b6a82702
Commit Graph

28202 Commits

Author SHA1 Message Date
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
Kitware Robot
33e7bd66c0 CMake Nightly Date Stamp 2020-01-25 00:01:08 -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
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
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
Kyle Edwards
b7a2baf38c Ninja Multi-Config: Add variable to control configs used in cross-config build 2020-01-23 15:47:12 -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
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
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
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
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
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
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
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
Kitware Robot
0877438599 CMake Nightly Date Stamp 2020-01-22 00:01:07 -05:00
Vitaly Stakhovsky
5e54b0cf2f cmInstallGenerator: std::string params 
Several construction parameters converted to std::string
Also made a few class members const
 2020-01-21 11:09:35 -05:00
Brad King
7a89e3c36c Merge topic 'install-std-string' 
9db532f44d cmInstall*Generator: std::string params

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4241
 2020-01-21 09:21:51 -05:00
Vitaly Stakhovsky
9db532f44d cmInstall*Generator: std::string params 
Several construction parameters converted to std::string
Also made a few class members const
 2020-01-21 09:19:13 -05:00
Ben Boeckel
eb2da206d9 cmGlobalNinjaGenerator: only restat build.ninja 
This reduces the work that ninja needs to do on a CMake reconfigure.
 2020-01-21 08:57:51 -05:00
Marc Chevrier
edab5add57 cmMakefileTargetGenerator: modernize memory management 2020-01-21 12:52:05 +01:00
Kitware Robot
2f7e76efa4 CMake Nightly Date Stamp 2020-01-21 00:01:16 -05:00
Ben Boeckel
3ec82b713e cmMarkAsAdvancedCommand: ignore variables which don't exist in the cache 
Fixes: #18331
 2020-01-20 15:49:29 -05:00
Vitaly Stakhovsky
2e768924f3 cmLocalVisualStudio7Generator: clean up c_str() 2020-01-20 15:44:07 -05:00
Brad King
941c09616b Merge topic 'multi-ninja-pch' 
a55df20499 Multi-Ninja: Add precompile headers support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4201
 2020-01-20 11:59:28 -05:00
Brad King
56a3e84a67 Merge topic 'realpath-cache' 
9d5a554cc9 cmGlobalGenerator: Add cache for realpath() results

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4220
 2020-01-20 11:55:04 -05:00
Brad King
6a5a23ea92 Merge topic 'autogen_rcc_skip_unity' 
086d9b2bab Autogen: Enable SKIP_UNITY_BUILD_INCLUSION on AUTORCC generated files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Cristian Adam <cristian.adam@gmail.com>
Merge-request: !4237
 2020-01-20 11:54:13 -05:00
Brad King
9b9dfacaa5 Merge topic 'acc-fix-in-source-depends-path' 
ba3a417dce Tests/CustomCommand: add a test for depending on a `./path`
e23475dc73 Tests/CustomCommand: fix custom command line to actually make its output
db4780d584 cmGeneratorTarget: search for relative paths to the binary directory
ec479f101f cmLocalGenerator: collapse the path after construction
fd0ba705ce add_custom_command: check if a relative path should be an in-source path
fd84f510f8 cmLocalGenerator: simplify the current source dir query

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4195
 2020-01-20 11:52:00 -05:00
Kitware Robot
5e38b8f608 CMake Nightly Date Stamp 2020-01-20 00:01:13 -05:00
Craig Scott
6bd07b9de1 Merge topic 'pch-msvc-no-path-repetition' 
07fe1bcd4e PCH: No repeated path for internal generated PCH files (MSVC case)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4236
 2020-01-19 15:10:17 -05:00
Kitware Robot
cd08cb7b8c CMake Nightly Date Stamp 2020-01-19 00:01:08 -05:00
Kitware Robot
5b4b808cb4 CMake Nightly Date Stamp 2020-01-18 00:01:15 -05:00
Cristian Adam
a55df20499 Multi-Ninja: Add precompile headers support 
Fixes: #19789
 2020-01-17 23:17:35 +01:00
Sebastian Holtermann
086d9b2bab Autogen: Enable SKIP_UNITY_BUILD_INCLUSION on AUTORCC generated files 
`rcc` generated files are not compatible with unity builds, because they
contain classes in anonymous namespaces and static data with identical names.

This patch sets the source file property `SKIP_UNITY_BUILD_INCLUSION` to `On`
on all `AUTORCC` generated files to exclude them from unity build files.

Fixes: #20191 "QT5: Exclude resource files from unity build"
 2020-01-17 09:48:35 -05:00
Brad King
a7fca06c46 Merge topic 'out-of-dir-link-list' 
f0e67da061 target_link_libraries: Fix out-of-dir linking of a list of targets
acee629103 cmTargetLinkLibrariesCommand: Move HandleLibrary to helper struct
ba675f1ecc Tests: Enable CMP0022 in ExportImport out-of-dir linking case

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4226
 2020-01-17 09:41:10 -05:00
Brad King
cd6f6b2a9f Merge topic 'cmake-ctest-arguments' 
4153d8445b Add CMAKE_CTEST_ARGUMENTS variable to pass command-line arguments to ctest

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4168
 2020-01-17 09:40:23 -05:00
Brad King
796d66438b Merge topic 'rename-cross-config-variable' 
310b58e961 Ninja Multi-Config: Rename variable to be more consistent

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4234
 2020-01-17 09:39:32 -05:00
Brad King
85e959b727 Merge topic 'feature/cmSourceFile-avoid-unnecessary-copy' 
5da3d01fd1 cmSourceFile: avoid unnnecessary copies

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4233
 2020-01-17 09:38:45 -05:00
Craig Scott
808888aa47 Merge topic 'cpack-custom-dmg-names' 
6d6f4b9316 CPack/DragNDrop: Support CPACK_DMG_<component>_FILE_NAME
b53230fbee Tests: Add DragNDrop as a testable CPack generator

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4227
 2020-01-17 08:33:01 -05:00