mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-07 06:09:52 -06:00
Code Issues Packages Projects Releases Wiki Activity
47,180 Commits 2 Branches 385 Tags
c06e0356017beef41cd2bb57a6cebfb242a9128e
Commit Graph

47180 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
c06e035601 Merge topic 'cuda_toolkit_dirs' 
0703e5fb6f CUDA: Perform CUDA toolkit include directory detection only on nvcc

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4443
 2020-03-10 10:30:49 -04:00
Brad King
637948ca3a Merge branch 'release-3.17' 2020-03-10 10:30:08 -04:00
Brad King
0290ba83ad Merge topic 'release-notes-minor-cleanups' 
d5e6fedd7b Help: Cleanup minor typos and grammar in 3.17 release notes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4449
 2020-03-10 10:30:07 -04:00
Brad King
7b7170a584 Merge topic 'release-notes-minor-cleanups' into release-3.17 
d5e6fedd7b Help: Cleanup minor typos and grammar in 3.17 release notes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4449
 2020-03-10 10:30:07 -04:00
Brad King
5428fa025d Merge branch 'release-3.17' 2020-03-10 10:29:15 -04:00
Brad King
c35af2583a Merge topic 'doc-3.17-relnotes' 
6b925d0536 Help: Fix 3.17 release notes for Xcode scheme settings
e0409b8bca Help: Fix toctree order of Xcode scheme variable and property

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4447
 2020-03-10 10:29:15 -04:00
Brad King
51c8ac8e89 Merge topic 'doc-3.17-relnotes' into release-3.17 
6b925d0536 Help: Fix 3.17 release notes for Xcode scheme settings
e0409b8bca Help: Fix toctree order of Xcode scheme variable and property

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4447
 2020-03-10 10:29:14 -04:00
Kyle Edwards
e49a21cff0 Merge branch 'release-3.17' 2020-03-10 10:16:17 -04:00
Kyle Edwards
2427bbf01c Merge topic 'swift-ninja-multiconfig' into release-3.17 
65b3848de0 Swift: support Ninja Multi-Config

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4440
 2020-03-10 10:16:17 -04:00
Kyle Edwards
228232d454 Merge topic 'swift-ninja-multiconfig' 
87819db28d Merge branch 'backport-swift-ninja-multiconfig' into swift-ninja-multiconfig
65b3848de0 Swift: support Ninja Multi-Config

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4440
 2020-03-10 10:16:17 -04:00
Brad King
6b925d0536 Help: Fix 3.17 release notes for Xcode scheme settings 
In commit 730a53ef1d (Help: Organize and revise 3.17 release notes,
2020-02-04, v3.17.0-rc1~21^2) we accidentally combined the release notes
for `CMAKE_XCODE_SCHEME_ENVIRONMENT` and `XCODE_SCHEME_WORKING_DIRECTORY`.
Split them up again.  Also mention `CMAKE_XCODE_SCHEME_WORKING_DIRECTORY`.

Fixes: #20439
 2020-03-10 08:51:53 -04:00
Brad King
e0409b8bca Help: Fix toctree order of Xcode scheme variable and property 
In commit 92c4c852db (Xcode: Add custom working directory property,
2019-11-18, v3.17.0-rc1~400^2) the toctree links to the new properties
were not added in sorted order.  Move them.

Issue: #20439
 2020-03-10 08:51:53 -04:00
Brad King
268909518f Merge topic 'file-CONFIGURE' 
a6fee09484 file: Add CONFIGURE subcommand

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4436
 2020-03-10 08:27:21 -04:00
Brad King
16ad4e5ce6 Merge topic 'modernize-memory-management' 
44867a8c01 Modernize memory management

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4444
 2020-03-10 08:26:27 -04:00
Brad King
30e67e752c Merge topic 'std-string-genex' 
b0dc52704b cmGeneratorExpression: remove const char* overloads

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4445
 2020-03-10 08:25:18 -04:00
Craig Scott
d5e6fedd7b Help: Cleanup minor typos and grammar in 3.17 release notes 2020-03-10 23:24:59 +11:00
Brad King
1ba7225480 Merge topic 'TI-C' 
5a0fc68312 TI: Fix C toolchain command-lines

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4422
 2020-03-10 08:24:13 -04:00
Brad King
d3d0358009 Merge branch 'release-3.17' 2020-03-10 08:22:58 -04:00
Brad King
058972b16f Merge topic 'cuda_warning' 
6ebc6cec41 cm_cxx_features: Filter out CUDA installation warnings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4437
 2020-03-10 08:22:58 -04:00
Brad King
cb84575b0d Merge topic 'cuda_warning' into release-3.17 
6ebc6cec41 cm_cxx_features: Filter out CUDA installation warnings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4437
 2020-03-10 08:22:57 -04:00
Brad King
6a7c614a7e Merge branch 'release-3.17' 2020-03-10 08:22:00 -04:00
Brad King
d11a5d8f2b Merge topic 'invalid_alias' into release-3.17 
a54d96b722 cmAlgorithms: Fix -Wnon-c-typedef-for-linkage warnings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4438
 2020-03-10 08:22:00 -04:00
Brad King
e154c70e48 Merge topic 'invalid_alias' 
a54d96b722 cmAlgorithms: Fix -Wnon-c-typedef-for-linkage warnings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4438
 2020-03-10 08:22:00 -04:00
Kitware Robot
df4acef151 CMake Nightly Date Stamp 2020-03-10 00:01:10 -04:00
Oliver Blasius
5a0fc68312 TI: Fix C toolchain command-lines 
Fix `armar` arguments.  Fix the linker `--map_file=` argument.
Enable response files.
 2020-03-09 12:02:20 -04:00
Leander Beernaert
a6fee09484 file: Add CONFIGURE subcommand 
Extend the `file()` command with a new `CONFIGURE` subcommand that
behaves the same as `string(CONFIGURE)` except that it writes the
resulting output immediately to a file.

Fixes: #20388
 2020-03-09 11:54:02 -04:00
Raul Tambre
a54d96b722 cmAlgorithms: Fix -Wnon-c-typedef-for-linkage warnings 
In commit bf1e73305a (cmAlgorithms: Refactor cmRemoveDuplicates,
2019-03-03, v3.15.0-rc1~414^2) we added `union X = struct {}`.
C++ had a rule change whereby only C-compatible unnamed typedefs are
allowed. Clang 11 warns about this by default.  See
https://reviews.llvm.org/D74103.  The aliases don't seem to be
necessary, so simply define as structs.
 2020-03-09 09:21:25 -04:00
Raul Tambre
6ebc6cec41 cm_cxx_features: Filter out CUDA installation warnings 
Clang always outputs these if it doesn't recognize the installed CUDA version.
They don't affect compiling C++.

Fixes #20434.
 2020-03-09 09:17:41 -04:00
Brad King
efa30023b4 Merge topic 'required_find_commands' 
dc00809596 find_*: Add support for REQUIRED keyword
cc070e66cd cmFindBase: Use in-class member initialization

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4435
 2020-03-09 09:15:38 -04:00
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
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