mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-28 09:58:53 -06:00
Code Issues Packages Projects Releases Wiki Activity
49,105 Commits 2 Branches 390 Tags
2d294219a5e8388b68bf2bec77946ce3477ba2c7
Commit Graph

29187 Commits

Author SHA1 Message Date
Brad King
2d294219a5 Merge topic 'ison-stdstring' 
7156911242 cmIsOn: add overload accepting const std::string*

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5013
 2020-07-15 06:47:46 -04:00
Kitware Robot
84c9e14bc2 CMake Nightly Date Stamp 2020-07-15 00:01:43 -04:00
Craig Scott
538668962e Merge topic 'source_file_props_dedup_scopes' 
f6969b917d set_property: Deduplicate source file directory scopes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5009
 2020-07-14 18:59:39 -04:00
Vitaly Stakhovsky
7156911242 cmIsOn: add overload accepting const std::string* 2020-07-14 08:22:24 -04:00
Brad King
2da778664d Merge topic 'genx-COMPILE_LANGUAGE-support' 
6491d2503c Genex $<COMPILE_LANGUAGE>: Extend contexts supported

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5005
 2020-07-14 07:22:30 -04:00
Brad King
35928fa7ca Merge topic 'getfeature-prop' 
18726ad634 GetFeature(): return cmProp

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5004
 2020-07-14 07:20:15 -04:00
Brad King
2455ec9565 Merge topic 'evaluate-cleanup' 
43f7b17816 cmGeneratorExpressionInterpreter::Evaluate: remove const char* overload

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5003
 2020-07-14 07:19:26 -04:00
Brad King
007cd3c83e Merge topic 'macos-11-file-GET_RUNTIME_DEPENDENCIES' 
d9af90504f Tests: Update file(G_R_D) test to make system library optional
c51400033c file: Update GET_RUNTIME_DEPENDENCIES for macOS 11 dylib cache

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !4998
 2020-07-14 07:15:12 -04:00
Brad King
41ede81341 Merge topic 'profiling-case-insensitive-command-names' 
7cf2f7d2af cmake: Store lowercase command names in profiling output

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5007
 2020-07-14 07:14:08 -04:00
Kitware Robot
8e7922e382 CMake Nightly Date Stamp 2020-07-14 00:01:11 -04:00
Alexandru Croitor
f6969b917d set_property: Deduplicate source file directory scopes 
A user could specify the same directory scope to set_property()
multiple times, which in conjunction with APPEND would append the
property multiple times.

Make sure to deduplicate scopes across both DIRECTORY and
TARGET_DIRECTORY options, so that a property is only appended
once in such a scenario.

Fixes: #20941
 2020-07-13 17:43:17 +02:00
Marc Chevrier
6491d2503c Genex $<COMPILE_LANGUAGE>: Extend contexts supported 
When genex $<TARGET_PROPERTY:...> for properties like INCLUDE_DIRECTORIES
is evaluated as part of add_custom_command or add_custom_target,
genex $<COMPILE_LANGUAGE> and $<COMPLIE_LANG_AND_ID> should be supported.

Fixes: #20926
 2020-07-13 16:27:19 +02:00
Brad King
c51400033c file: Update GET_RUNTIME_DEPENDENCIES for macOS 11 dylib cache 
Starting on macOS 11, the dynamic loader has a builtin cache of
system-provided dylib files.  They do not actually exist on the
filesystem.  However, runtime dependencies recorded in Mach-O binaries
can still have `LC_LOAD_DYLIB` entries referring to such dylib files by
absolute path.  The dynamic loader simply resolves the paths from its
cache.  Teach `file(GET_RUNTIME_DEPENDENCIES)` to skip dependencies on
such dylib paths.  For practical software distribution purposes they do
not exist, or at least can be assumed available on all deployments.

Issue: #20863
 2020-07-13 08:31:59 -04:00
Brad King
c361600fc4 Merge topic 'stdstring-compute' 
9b236b5451 cmComputeLinkInformation: members use std:string arguments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4999
 2020-07-13 08:07:34 -04:00
Brad King
2282be37a5 Merge topic 'stl-support-filesystem-path' 
d654bf3449 STL Support: Add cm::filesystem::path in <cm/filesystem>
e5798126fc STL Support: introduce dedicated configuration file
4408f34cfe STL Support: Add function cm::quoted in <cm/iomanip>

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4968
 2020-07-13 07:59:43 -04:00
Brad King
8d268f57b4 Merge topic 'cuda-memcheck' 
cee92a9fb0 Help: add release notes for CTest cuda-memcheck support
f38e4a1871 Tests: Add cases for CTest cuda-memcheck parser
fe062800f0 CTest: add cuda-memcheck support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: tcojean <terry.cojean@kit.edu>
Merge-request: !4952
 2020-07-13 07:58:38 -04:00
Brad King
46f1fa01da Merge topic 'imported-local-target-alias' into release-3.18 
7b0f6508a0 ALIAS targets: Non-global aliases must be propagated to sub-directories

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5002
 2020-07-13 07:56:13 -04:00
Brad King
7160a2b9d9 Merge topic 'imported-local-target-alias' 
7b0f6508a0 ALIAS targets: Non-global aliases must be propagated to sub-directories

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5002
 2020-07-13 07:53:01 -04:00
Brad King
5899e849d0 Merge topic 'supported-profiling-formats' 
9c3beb532f cmake: Show supported formats in --help output for --profiling-format

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: dublet <github@dublet.org>
Merge-request: !5001
 2020-07-13 07:49:47 -04:00
Kitware Robot
c441b8a7f8 CMake Nightly Date Stamp 2020-07-13 00:01:07 -04:00
Craig Scott
7cf2f7d2af cmake: Store lowercase command names in profiling output 
This ensures commands can be properly aggregated by tools
processing the profiling output.

Fixes: #20946
 2020-07-13 11:03:05 +10:00
Kitware Robot
32c000823e CMake Nightly Date Stamp 2020-07-12 00:01:07 -04:00
Vitaly Stakhovsky
18726ad634 GetFeature(): return cmProp 2020-07-11 14:03:03 -04:00
Vitaly Stakhovsky
43f7b17816 cmGeneratorExpressionInterpreter::Evaluate: remove const char* overload 2020-07-11 11:51:22 -04:00
Marc Chevrier
7b0f6508a0 ALIAS targets: Non-global aliases must be propagated to sub-directories 
Fixes: #20942
 2020-07-11 16:59:50 +02:00
Craig Scott
9c3beb532f cmake: Show supported formats in --help output for --profiling-format 
Fixes: #20943
 2020-07-11 23:14:03 +10:00
Kitware Robot
fd1df4995b CMake Nightly Date Stamp 2020-07-11 00:01:08 -04:00
Vitaly Stakhovsky
9b236b5451 cmComputeLinkInformation: members use std:string arguments 2020-07-10 10:22:50 -04:00
Brad King
6ab08c4e99 CMake 3.18.0-rc4 2020-07-10 06:49:28 -04:00
Brad King
9e2d480a3f Merge topic 'string-cleanup' 
8ef18e8525 Clean a few string conversions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4997
 2020-07-10 06:46:28 -04:00
Brad King
a5064f6e65 Merge topic 'source_file_both_props' 
961ee62faa Help: Update get_property and get_source_file_property docs
1235f2d747 set_property: Allow both DIRECTORY and TARGET_DIRECTORY together
177052d6b8 set_property: Fix name of TARGET_DIRECTORY option in error messages

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4994
 2020-07-10 06:45:09 -04:00
Kitware Robot
1e5f5fbb1e CMake Nightly Date Stamp 2020-07-10 00:01:08 -04:00
Tobias Ribizel
fe062800f0 CTest: add cuda-memcheck support 2020-07-09 19:08:32 +02:00
Marc Chevrier
d654bf3449 STL Support: Add cm::filesystem::path in <cm/filesystem> 2020-07-09 17:02:42 +02:00
Vitaly Stakhovsky
8ef18e8525 Clean a few string conversions 2020-07-09 09:42:00 -04:00
Marc Chevrier
e5798126fc STL Support: introduce dedicated configuration file 2020-07-09 15:24:43 +02:00
Brad King
43372d5ba3 Merge topic 'file-GENERATE-tmp' 
4d40253f1c Tests: Cover file(GENERATE) using 'foo.tmp' as input for output 'foo'
eaa420e99c cmGeneratedFileStream: Use random temporary file extension by default
09ff1cb650 cmCTest: Explicitly specify '.tmp' extension on in-progress log files
0d3a034725 cmGeneratedFileStream: Optionally use custom temporary file extension

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4992
 2020-07-09 06:53:36 -04:00
Alexandru Croitor
1235f2d747 set_property: Allow both DIRECTORY and TARGET_DIRECTORY together 
Allow to specify both DIRECTORY and TARGET_DIRECTORY at the same time in
`set_source_files_properties()` and `set_property(SOURCE)` commands.

Add test cases and update the documentation.

Fixes: #20932
 2020-07-09 06:33:52 -04:00
Alexandru Croitor
177052d6b8 set_property: Fix name of TARGET_DIRECTORY option in error messages 2020-07-09 06:33:03 -04:00
Kitware Robot
6f3a5fef84 CMake Nightly Date Stamp 2020-07-09 05:30:04 -04:00
Brad King
eaa420e99c cmGeneratedFileStream: Use random temporary file extension by default 
Avoid collisions with project-specified files named with `.tmp`.

Issue: #20873
 2020-07-08 15:49:56 -04:00
Brad King
09ff1cb650 cmCTest: Explicitly specify '.tmp' extension on in-progress log files 
Do not depend on `cmGeneratedFileStream` to have this default.
 2020-07-08 15:49:56 -04:00
Brad King
0d3a034725 cmGeneratedFileStream: Optionally use custom temporary file extension 2020-07-08 15:49:56 -04:00
Brad King
fc3f932e3c Merge topic 'languageStandardMultipleBacktraceSupport' 
2f383d852d fileapi: Support multiple backtraces for language standard
cc96fb617b Add BTs helper to support multiple backtraces

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4960
 2020-07-08 08:28:46 -04:00
Brad King
6e44bd186c Merge topic 'cpack-dmg-sla' 
1ace607329 CPack/DragNDrop: Re-implement SLA attachment to avoid deprecated tools
98e0cbd8eb Tests: Verify DMG default SLA content
b33283a282 Tests: Cover using RTF for DMG SLAs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4972
 2020-07-08 08:27:57 -04:00
Kitware Robot
e9275ad1a1 CMake Nightly Date Stamp 2020-07-08 07:17:31 -04:00
Brad King
6bdbc7dba0 Merge topic 'cmake-gui-qt-5.14' 
8eb7cf9b5f cmake-gui: Fix compilation as C++14 with Qt 5.14

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !4978
 2020-07-07 09:17:23 -04:00
Brad King
dab33d1e33 Merge topic 'cmake-gui-qt-5.14' into release-3.18 
8eb7cf9b5f cmake-gui: Fix compilation as C++14 with Qt 5.14

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !4978
 2020-07-07 09:17:22 -04:00
Brad King
1ace607329 CPack/DragNDrop: Re-implement SLA attachment to avoid deprecated tools 
The `Rez` tool has been deprecated since Xcode 6.  The `hdiutil flatten`
and `hdiutil unflatten` tools have been deprecated since macOS 10.15 and
are removed in macOS 11.  Instead use `hdiutil udifrez` to attach the
SLA resources to disk images.  This tool accepts XML input files, so
convert our resource file generation to produce that format.

Fixes: #20889
 2020-07-07 08:08:21 -04:00
Kitware Robot
ce4ed6219a CMake Nightly Date Stamp 2020-07-07 00:02:09 -04:00