mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-12-30 18:29:37 -06:00
Code Issues Packages Projects Releases Wiki Activity
47,245 Commits 2 Branches 385 Tags
ffa08d256fa0aaa52afcb05b50f4d4a485d84171
Commit Graph

28483 Commits

Author SHA1 Message Date
Brad King
200bc3b785 Merge topic 'swift-implicit-module-include-dir' 
2026915f8f Swift: Propagate Swift_MODULE_DIRECTORY as include directory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4320
 2020-03-13 11:00:39 -04:00
Brad King
1b5554e863 Merge topic 'profiling' 
9aa4640792 cmake: add command line options to output script profiling data

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Acked-by: Pavel Solodovnikov <hellyeahdominate@gmail.com>
Acked-by: Leonid Pospelov <pospelovlm@yandex.ru>
Acked-by: Cristian Adam <cristian.adam@gmail.com>
Merge-request: !2760
 2020-03-13 10:59:03 -04:00
Kitware Robot
78fd95fc1d CMake Nightly Date Stamp 2020-03-13 00:01:11 -04:00
Saleem Abdulrasool
2026915f8f Swift: Propagate Swift_MODULE_DIRECTORY as include directory 
Teach include directory computation for Swift to implicitly propagate
the `Swift_MODULE_DIRECTORY` of all linked targets as include
directories.  This is required to ensure that the swiftmodule of a
linked target is accessible to the compiler of the current target.

Fixes: #19272
 2020-03-12 11:50:43 -04:00
Brad King
1e3af78f63 Merge topic 'swift-link-line-spaces' 
af39d1b993 Swift: Fix quoting of library search paths with spaces

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4469
 2020-03-12 09:32:01 -04:00
Saleem Abdulrasool
af39d1b993 Swift: Fix quoting of library search paths with spaces 
The library search paths added by commit 2746c61e6d (Swift: Add library
search paths for dependencies, 2019-06-09, v3.16.0-rc1~561^2) need to be
quoted properly on command lines to handle spaces and such.  This was
already done by `cmLinkLineComputer::ComputeLinkPath` for
non-Swift-specific link directories.
 2020-03-12 08:46:11 -04:00
Brad King
f86d8009c6 Merge topic 'add-cache-definition' 
36a5b3d1d1 cmMakefile::AddCacheDefinition: Add overload that accepts std::string value

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4457
 2020-03-12 08:26:07 -04:00
Brad King
74954a6657 Merge topic 'modernize-memory-management' 
f964739ead cmCTestRunTest: modernize memory management

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4454
 2020-03-12 08:25:20 -04:00
Brad King
7ed1d5c342 Merge topic 'ctest-curl-debugfunction' 
7a1cce210b CTest: Fix our internal CURL_DEBUGFUNCTION to conform to CURL docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4459
 2020-03-12 08:19:43 -04:00
Craig Scott
54863e28ce Merge topic 'rename-macho-version-properties' 
14732d3f30 macOS: Rename OSX_*_VERSION properties to MACHO_*_VERSION

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4452
 2020-03-12 06:52:11 -04:00
Brad King
14732d3f30 macOS: Rename OSX_*_VERSION properties to MACHO_*_VERSION 
The properties added by commit 4a62e3d97c (macOS: Add
OSX_COMPATIBILITY_VERSION and OSX_CURRENT_VERSION properties,
2020-01-24, v3.17.0-rc1~80^2~1) are general-purpose for all platforms
using Mach-O formats and not just on OS X.  Rename them accordingly.
The properties are new to the CMake 3.17 release so we can rename
them without compatibility concerns.

Fixes: #20442
 2020-03-12 21:15:40 +11:00
Kitware Robot
662d17e910 CMake Nightly Date Stamp 2020-03-12 00:01:09 -04:00
Betsy McPhail
7a1cce210b CTest: Fix our internal CURL_DEBUGFUNCTION to conform to CURL docs 
The curl debug callback function must return ``0``.

Fixes: #20449
 2020-03-11 13:36:58 -04:00
Marc Chevrier
f964739ead cmCTestRunTest: modernize memory management 2020-03-11 17:46:11 +01:00
Vitaly Stakhovsky
36a5b3d1d1 cmMakefile::AddCacheDefinition: Add overload that accepts std::string value 2020-03-11 09:40:43 -04:00
Brad King
c7c6e103d1 Merge topic 'loops-improve' 
cbbca9ee2a Convert more loops to range-based for-loops
9296cd0551 GHS: Name range-based for-loop variable types explicitly
db17de2438 GHS: Use cm::erase in place of loop

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4446
 2020-03-11 09:27:24 -04:00
Brad King
38072787d5 Merge topic 'std-string-cleanup' 
a6cd48ac41 Source: use std::string overloads

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4453
 2020-03-11 09:26:31 -04:00
Kitware Robot
86580c2b92 CMake Nightly Date Stamp 2020-03-11 00:01:10 -04:00
Vitaly Stakhovsky
cbbca9ee2a Convert more loops to range-based for-loops 2020-03-10 14:25:56 -04:00
Vitaly Stakhovsky
9296cd0551 GHS: Name range-based for-loop variable types explicitly 
In general we avoid using `auto` except in cases of hard-to-name types
like iterators.
 2020-03-10 14:25:53 -04:00
Vitaly Stakhovsky
db17de2438 GHS: Use cm::erase in place of loop 2020-03-10 14:25:36 -04:00
Vitaly Stakhovsky
a6cd48ac41 Source: use std::string overloads 2020-03-10 10:55:09 -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
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
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
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
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
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
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
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
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
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
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