mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-09 00:29:55 -06:00
Code Issues Packages Projects Releases Wiki Activity
47,755 Commits 2 Branches 390 Tags
8bc757c8f68d653526dce3f723950ccf221a4c6c
Commit Graph

2036 Commits

Author SHA1 Message Date
Brad King
d601a2c75c Merge topic 'FindPython-dev-subcomponents' 
c1b4044d3e FindPython: add sub-components to Development component

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !4616
 2020-04-17 08:05:39 -04:00
Kyle Edwards
5f20e85412 Merge topic 'cat_cmd_20557' 
a625f30785 cmake -E: add cat command.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4600
 2020-04-16 11:35:55 -04:00
Brad King
7e8df1bb24 Merge topic 'cuda_architectures' 
21131ca60c CUDA: Add CudaOnly.CompileFlags test
f0931b0790 CUDA: Convert tests to use CUDA_ARCHITECTURES
e98588aaba CUDA: Add CUDA_ARCHITECTURES target property

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Patrick Stotko <stotko@cs.uni-bonn.de>
Merge-request: !4568
 2020-04-16 11:11:33 -04:00
Marc Chevrier
c1b4044d3e FindPython: add sub-components to Development component 
Fixes: #20425
 2020-04-16 14:38:39 +02:00
Johnny Jazeix
a625f30785 cmake -E: add cat command. 
Concatenate files and print on the standard output.

FIXES: #20557
 2020-04-15 20:56:56 +02:00
Raul Tambre
e98588aaba CUDA: Add CUDA_ARCHITECTURES target property 
Simplifies CUDA target architecture handling.

Required for Clang support as Clang doesn't automatically select a supported architecture.
We detect a supported architecture during compiler identification and set CMAKE_CUDA_ARCHITECTURES to it.

Introduces CMP0104 for backwards compatibility with manually setting code generation flags with NVCC.

Implements #17963.
 2020-04-15 17:55:41 +03:00
Brad King
4f7d16c68f Merge topic 'cpack-nsis-dpi-aware' 
d6840a4f3c CPack/NSIS: Add option for setting DPI-aware

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4607
 2020-04-15 09:50:49 -04:00
Johnny Jazeix
d6840a4f3c CPack/NSIS: Add option for setting DPI-aware 
See https://nsis.sourceforge.io/Reference/ManifestDPIAware
for more information.

Fixes: #17724
 2020-04-14 13:47:49 +02:00
Johnny Jazeix
da99eca1e7 list: add NATURAL sorting on SORT sub-command 
Fixes: #20563
 2020-04-13 18:26:28 +02:00
Harry Mallon
bf94dcba76 file(UPLOAD): Add support for TLS_VERIFY and TLS_CAINFO 
* Improve and test err messages when TLS_VERIFY and TLS_CAINFO
  are not set in file(DOWNLOAD) and file(UPLOAD).
 2020-04-08 15:15:49 +01:00
Brad King
b59b771eca Merge topic 'doc-3.15-std-fix' 
182a104478 Help: Add 3.15 release note for change in -std= flag for compile features

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4574
 2020-04-06 10:24:37 -04:00
Brad King
182a104478 Help: Add 3.15 release note for change in -std= flag for compile features 
Issue: #19917
 2020-04-06 09:54:10 -04:00
Brad King
f0a27e44f3 Merge topic 'parallel-lzma-compression' 
b3bacf0152 cmCPackArchiveGenerator: support multithreaded compression
b71d385ed4 cmCPackArchiveGenerator: support setting archive options
948aa8bd1c cmArchiveWrite: support setting archive filter options
b9c17de023 cmArchiveWrite: split out opening the file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Cristian Adam <cristian.adam@gmail.com>
Merge-request: !3195
 2020-04-06 08:28:19 -04:00
Brad King
2b9e3abcb5 Merge topic 'ctest-resource-file-cache' 
060d2ce269 CTest: Add CTEST_RESOURCE_SPEC_FILE variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4564
 2020-04-06 08:26:40 -04:00
Ben Boeckel
b3bacf0152 cmCPackArchiveGenerator: support multithreaded compression 2020-04-03 07:35:35 -04:00
Brad King
02dd24a928 curl: Enable HTTP/2 support by using nghttp2 2020-04-03 06:43:00 -04:00
Kyle Edwards
060d2ce269 CTest: Add CTEST_RESOURCE_SPEC_FILE variable 2020-04-02 16:29:50 -04:00
Brad King
4e69c9d8d8 Merge topic 'cpack-nsis-version' 
aa78a2537c CPack/NSIS: Document and check requirement of at least NSIS 3.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4552
 2020-04-01 10:43:25 -04:00
Brad King
aa78a2537c CPack/NSIS: Document and check requirement of at least NSIS 3.0 
Since commit 9d2816544e (CPack/NSIS: Also preload the "UserInfo.dll"
plugin, 2020-01-04, v3.17.0-rc1~204^2) we require NSIS 3.0.  Since
older versions do not support Windows 8 or above, we can now require
at least version 3.0.

Fixes: #20514
 2020-03-31 10:57:28 -04:00
Brad King
529d7291b4 Merge topic 'GoogleTest-DISCOVERY_MODE-note' 
398a2bddf3 Help: Add release note for GoogleTest module DISCOVERY_MODE feature
2361f4efe1 Help: Update GoogleTest XML_OUTPUT_DIR release note markup

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4550
 2020-03-31 09:25:09 -04:00
Brad King
398a2bddf3 Help: Add release note for GoogleTest module DISCOVERY_MODE feature 
This feature was added by commit 75e82a13db (GoogleTest: Add new
DISCOVERY_MODE option to gtest_discover_tests, 2020-03-16) but a
release note was accidentally left out.  Add one now.
 2020-03-31 07:18:14 -04:00
Brad King
2361f4efe1 Help: Update GoogleTest XML_OUTPUT_DIR release note markup 2020-03-31 07:17:54 -04:00
Brad King
ad22d0c1d0 Merge topic 'vs-non-built-file-item-metadata' 
0723e04f7a VS: Add documentation for VS_SETTINGS and VS_SOURCE_SETTINGS_<tool>.
2ca1102f83 VS: Test VS_SETTINGS and VS_SOURCE_SETTINGS_<tool> properties.
f00e1b816d VS: Add VS_SOURCE_SETTINGS_<tool> target property
2ce42f281f VS: Add VS_SETTINGS source file property
53116d3942 VS: Use unordered_map to write HLSL settings.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4498
 2020-03-30 13:28:19 -04:00
Matt Davies
0723e04f7a VS: Add documentation for VS_SETTINGS and VS_SOURCE_SETTINGS_<tool>. 2020-03-27 12:01:21 -04:00
Brad King
f670435715 Merge topic 'pch-warn-invalid' 
2ce08e5489 PCH: add an option to disable `-Winvalid-pch`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4499
 2020-03-27 08:03:30 -04:00
Cristian Adam
2ce08e5489 PCH: add an option to disable -Winvalid-pch 
Fixes: #20295
 2020-03-26 14:24:46 +01:00
Marc Chevrier
0cd20e8f62 export(): raise an error on multiple calls with same FILE 
Fixes: 20472
 2020-03-26 13:20:45 +01:00
Brad King
bee0100396 Merge topic 'file-archive' 
c7e1198a23 file: Add ARCHIVE_{CREATE|EXTRACT} subcommands

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4475
 2020-03-17 08:06:57 -04:00
Brad King
c6def2107f Merge topic 'gtest-parallel-xml' 
32bc6aa9b6 GoogleTest: Add release note for XML_OUTPUT_DIR
0001339a6f GoogleTest: Add test case for XML_OUTPUT_DIR
e9ab39eb1d GoogleTest: Add XML_OUTPUT_DIR parameter

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4433
 2020-03-16 11:40:21 -04:00
Cristian Adam
c7e1198a23 file: Add ARCHIVE_{CREATE|EXTRACT} subcommands 
Fixes: #20443
 2020-03-16 14:33:27 +01:00
Brad King
3766633b8a Merge topic 'FindRuby-variable-case' 
e672db628b FindRuby: Rename variables to match case of module name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Frank Dana <ferdnyc@gmail.com>
Merge-request: !4463
 2020-03-13 11:01:56 -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
Alexander Stein
32bc6aa9b6 GoogleTest: Add release note for XML_OUTPUT_DIR 2020-03-13 10:47:34 -04:00
Craig Scott
3d388e5e98 Merge topic 'rename-macho-version-properties' into release-3.17 
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
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
Julien Marrec
e672db628b FindRuby: Rename variables to match case of module name 
Use recommended case for variable names, i.e. matching name of the
module as passed to `find_package`.

For backwards compatibility, the upper case versions of both input and
output variables are used and defined when appropriate.  Skip this for
the _FOUND variable because FPHSA already does it.

This follows the approach from commit a7b09e7f43 (FindProtobuf: Rename
variables to match case of module name, 2016-03-01, v3.6.0-rc1~273^2).

Issue: #20370
 2020-03-11 13:56:10 -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
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
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
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
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
Craig Scott
d5e6fedd7b Help: Cleanup minor typos and grammar in 3.17 release notes 2020-03-10 23:24:59 +11: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
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
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
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
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