mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-02 20:00:38 -06:00
Code Issues Packages Projects Releases Wiki Activity
47,352 Commits 2 Branches 385 Tags
94de927cab19609aeeff032c64f16cfd257fca2f
Commit Graph

47352 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
bb9dc34800 Merge topic 'FindArmadillo-wrappers' 
38c6dd7b19 FindArmadillo: Add support for non-wrapper case

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4418
 2020-03-09 09:13:40 -04:00
Kyle Edwards
87819db28d Merge branch 'backport-swift-ninja-multiconfig' into swift-ninja-multiconfig 2020-03-09 09:12:54 -04:00
Saleem Abdulrasool
65b3848de0 Swift: support Ninja Multi-Config 
Enable support for multi-configuration builds using Ninja when building
Swift.
 2020-03-09 09:11:22 -04:00
Brad King
51238ec1d9 Merge branch 'release-3.16' 2020-03-09 09:00:15 -04:00
Brad King
a4626ab996 Merge branch 'release-3.17' 2020-03-09 08:58:39 -04:00
Brad King
6857aaaa06 Merge topic 'ibmi-fix-libuv-build' into release-3.17 
7d6bd14dca libuv: Add support for building on IBM i (OS400)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4431
 2020-03-09 08:58:38 -04:00
Brad King
809570c4a9 Merge topic 'ibmi-fix-libuv-build' 
7d6bd14dca libuv: Add support for building on IBM i (OS400)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4431
 2020-03-09 08:58:38 -04:00
Kitware Robot
ca8e37f72e CMake Nightly Date Stamp 2020-03-09 00:01:08 -04:00
Vitaly Stakhovsky
b0dc52704b cmGeneratorExpression: remove const char* overloads 2020-03-08 17:22:43 -04:00
Raul Tambre
0703e5fb6f CUDA: Perform CUDA toolkit include directory detection only on nvcc 
The code is specific to nvcc.
 2020-03-08 18:58:56 +02:00
Marc Chevrier
44867a8c01 Modernize memory management 
Update internals of various classes.
 2020-03-08 16:32:44 +01:00
Kitware Robot
1bb7474aba CMake Nightly Date Stamp 2020-03-08 00:01:21 -05:00
Wouter Klouwen
9aa4640792 cmake: add command line options to output script profiling data 
For users of CMake who want to optimize their scripts if they take a
while to run, this commit adds the ability to output profiling data.

To enable this output, it adds the two command line parameters
to select the output path and format.

This commit adds the first profiling format of type ``google-trace``,
which is the output is a JSON file containing Duration events as per the
Google Trace Format specification:

https://docs.google.com/document/d/1CvAClvFfyA5R-
PhYUmn5OOQtYMH4h6I0nSsKchNAySU/preview#
 2020-03-07 13:36:27 +00:00
Kitware Robot
8f122b4557 CMake Nightly Date Stamp 2020-03-07 00:01:12 -05:00
Brad King
2c3cf6371f Merge branch 'ibmi-fix-libuv-build' into release-3.16 
Merge-request: !4431
 2020-03-06 14:25:50 -05:00
Jesse Gorzinski
7d6bd14dca libuv: Add support for building on IBM i (OS400) 2020-03-06 14:24:01 -05:00
Ryan Birmingham
38c6dd7b19 FindArmadillo: Add support for non-wrapper case 
Armadillo is typically built as a wrapper library, which is what this
find module has historically supported, but it does not have to be.
If not, then instead of armadillo itself, we need to link to some
combination of dependencies and not armadillo.
 2020-03-06 11:29:21 -05:00
Sylvain Joubert
dc00809596 find_*: Add support for REQUIRED keyword 
In the same spirit as the REQUIRED keyword on find_package, this will
stop cmake execution with an error on a failed find_program, find_file,
find_path or find_library.
 2020-03-06 16:40:26 +01:00
Sylvain Joubert
cc070e66cd cmFindBase: Use in-class member initialization 2020-03-06 16:07:18 +01:00
Brad King
41162cbb81 Merge topic 'ConvertMSBuildXMLToJSON-default-mutable' 
98e735903a MSBuild: Fix python mutable default data structure

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Drew Dennison <dennison@mit.edu>
Merge-request: !4432
 2020-03-06 09:42:20 -05:00
Brad King
3665d27c12 Merge branch 'release-3.16' 2020-03-06 09:26:13 -05:00
Brad King
b7d43ea0da Merge topic 'cmstd-IBM-i' into release-3.17 
917db8163d cmstd: Remove -isystem option for IBM i (OS400)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4430
 2020-03-06 09:24:45 -05:00
Brad King
d9dec23b88 Merge branch 'release-3.17' 2020-03-06 09:24:45 -05:00
Brad King
21bbc56fb5 Merge topic 'cmstd-IBM-i' 
917db8163d cmstd: Remove -isystem option for IBM i (OS400)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4430
 2020-03-06 09:24:45 -05:00
Brad King
6deb9da277 Merge branch 'release-3.17' 2020-03-06 09:23:36 -05:00
Brad King
a1ccbab5a8 Merge branch 'release-3.16' into release-3.17 2020-03-06 09:23:23 -05:00
Brad King
a99edc491b Merge branch 'release-3.17' 2020-03-06 09:20:02 -05:00
Brad King
6746fdf7cb Merge topic 'doc-add_custom_command-depends' into release-3.17 
785f2b2df1 Help: Clarify add_custom_command DEPENDS conversion to file paths

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !4434
 2020-03-06 09:20:02 -05:00
Brad King
05e647759d Merge topic 'doc-add_custom_command-depends' 
785f2b2df1 Help: Clarify add_custom_command DEPENDS conversion to file paths

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !4434
 2020-03-06 09:20:02 -05:00
Brad King
995b122471 Merge topic 'FindPython-artifacts-scope' 
e5b4c74238 FindPython: Add possibility to control scope of artifacts.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4426
 2020-03-06 09:18:24 -05:00
Brad King
74359da1e9 Merge topic 'modernize-memory-management' 
9de0355d4f Modernize memory management

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4428
 2020-03-06 09:17:39 -05:00
Brad King
7d63476e2f Merge topic 'update-curl' 
85ad7190f3 curl: Set build options the way we need for CMake
d61c3bd505 Merge branch 'upstream-curl' into update-curl
735ea3001a curl 2020-03-04 (b8d13668)
84dc14a967 curl: Update script to get curl 7.69.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4429
 2020-03-06 09:16:35 -05:00
Brad King
785f2b2df1 Help: Clarify add_custom_command DEPENDS conversion to file paths 
In commit f5126badd8 (add_custom_command: convert DEPENDS path arguments
to absolute paths, 2019-12-18, v3.17.0-rc1~263^2) we updated the
documentation to describe the behavior introduced by that commit.
However, the behavior was removed again by commit fd0ba705ce
(add_custom_command: check if a relative path should be an in-source
path, 2020-01-09, v3.17.0-rc1~141^2~4) without updating the
documentation.

Update the documentation again to describe the behavior as of the latter
commit.  Spell out the steps that `cmLocalGenerator::GetRealDependency`
and `cmTargetTraceDependencies::IsUtility` use to add file-level and
target-level dependencies.
 2020-03-06 08:44:46 -05:00
Kitware Robot
4a1baca6f7 CMake Nightly Date Stamp 2020-03-06 00:01:10 -05:00
Brendon Go
98e735903a MSBuild: Fix python mutable default data structure 
Change default value of arguments to be None and instantiate new
object inside function.
 2020-03-05 20:42:46 -05:00
Brad King
2de860513d Merge branch 'cmstd-IBM-i' into release-3.16 
Merge-request: !4430
 2020-03-05 15:09:09 -05:00
ThePrez
917db8163d cmstd: Remove -isystem option for IBM i (OS400) 
Much like AIX, IBM i (OS identifier "OS400") implicitly adds `extern
"C"` around system header files included with the `-isystem` option.
Update the condition added by commit c688b401d3 (cmstd: Modernize CMake
system headers, 2019-08-04, v3.16.0-rc1~81^2~1) to treat `IBM i` as we
do AIX.
 2020-03-05 15:07:46 -05:00
Kyle Edwards
e484b4289d Merge topic 'macos_framework_postfix' 
ad3f69c86e Add support for FRAMEWORK_MULTI_CONFIG_POSTFIX_<CONFIG>

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4289
 2020-03-05 10:50:15 -05:00
Marc Chevrier
e5b4c74238 FindPython: Add possibility to control scope of artifacts. 
Fixes: #20362
 2020-03-05 16:44:48 +01:00
Marc Chevrier
9de0355d4f Modernize memory management 
Update internals of various classes.
 2020-03-05 07:34:01 -05:00
Brad King
fee2b209b8 Merge topic 'objlib-transitive-deps' 
a833aa1167 Fix dependencies on targets linked through object libraries
3b3de0fd17 Tests: Extend ObjectLibrary test with case for object lib dependencies

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4427
 2020-03-05 07:26:18 -05:00
Brad King
da47b8f60f Merge branch 'release-3.17' 2020-03-05 07:24:49 -05:00
Brad King
9871190dd7 Merge topic 'ninja-multi-custom-command-deps' 
081c4679f7 Ninja Multi-Config: Don't build target dependencies for custom commands

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4423
 2020-03-05 07:24:49 -05:00
Brad King
cf0dc5efbf Merge topic 'ninja-multi-custom-command-deps' into release-3.17 
081c4679f7 Ninja Multi-Config: Don't build target dependencies for custom commands

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4423
 2020-03-05 07:24:48 -05:00
Brad King
612da5775e Merge topic 'update-kwsys' 
9e6b07f5ff Merge branch 'upstream-KWSys' into update-kwsys
ec33e3600c KWSys 2020-03-04 (6af2e592)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4424
 2020-03-05 07:23:24 -05:00
Brad King
fbe5caee8f Merge topic 'findx11-improvement' 
77802aab97 FindX11: Find additional libraries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !4101
 2020-03-05 07:22:39 -05:00
Kitware Robot
b0e34a3160 CMake Nightly Date Stamp 2020-03-05 00:01:10 -05:00
Brad King
85ad7190f3 curl: Set build options the way we need for CMake 2020-03-04 14:35:09 -05:00
Brad King
d61c3bd505 Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2020-03-04 (b8d13668)
 2020-03-04 14:34:39 -05:00
Curl Upstream
735ea3001a curl 2020-03-04 (b8d13668) 
Code extracted from:

    https://github.com/curl/curl.git

at commit b8d1366852fd0034374c5de1e4968c7a224f77cc (curl-7_69_0).
 2020-03-04 14:34:23 -05:00