mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-03 21:00:01 -05:00
Code Issues Packages Projects Releases Wiki Activity
49,488 Commits 2 Branches 401 Tags
f7dd74e4efb9744dccec40406f146fbd031edef5
Commit Graph

29357 Commits

Author SHA1 Message Date
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
Justin Goshi 2f383d852d fileapi: Support multiple backtraces for language standard 2020-07-06 11:40:39 -07:00
Justin Goshi cc96fb617b Add BTs helper to support multiple backtraces 2020-07-06 11:31:09 -07:00
Brad King 8eb7cf9b5f cmake-gui: Fix compilation as C++14 with Qt 5.14 
Fix code added by commit d7679f6427 (QCMakeCacheView: use non-deprecated
List and Set constructions, 2020-06-10, v3.18.0-rc2~13^2), used
conditionally on Qt 5.14 or above, to compile as C++14.
 2020-07-06 11:45:03 -04:00
Brad King a4cfc7d03c Merge topic 'refactor-generator-configs' 
7a969fe21d cmMakefile: Refactor API to better handle empty config values

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4957
 2020-07-06 09:28:11 -04:00
Brad King ab46e71eeb Merge topic 'cmStandardLevelResolver-refactor' 
49f3e0ab6f cmStandardLevelResolver: Refactor to remove duplicate code

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4966
 2020-07-06 09:27:19 -04:00
Kitware Robot c68c744497 CMake Nightly Date Stamp 2020-07-06 00:02:07 -04:00
Kitware Robot fdd90a4b66 CMake Nightly Date Stamp 2020-07-05 00:02:37 -04:00
Kitware Robot 940857844e CMake Nightly Date Stamp 2020-07-04 00:02:39 -04:00
Robert Maynard 7a969fe21d cmMakefile: Refactor API to better handle empty config values 2020-07-03 07:43:18 -04:00
Robert Maynard 49f3e0ab6f cmStandardLevelResolver: Refactor to remove duplicate code 
This will make it easier to add new languages that have standard flags.
 2020-07-03 07:37:45 -04:00
Brad King bc27f26fbc Merge topic 'xcode-lang-mm' 
258c8734a9 Xcode: Fix LANGUAGE property on .m/.mm files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4965
 2020-07-03 07:32:06 -04:00
Harry Mallon 258c8734a9 Xcode: Fix LANGUAGE property on .m/.mm files 
When OBJC or OBJCXX is enabled as a language, prefer that for .m and .mm
source file language selection.

Fixes: #20257
 2020-07-03 07:30:50 -04:00
Brad King b902da418d Merge topic 'restore-cwd-translation-map' into release-3.18 
85a945a607 Restore handling of build directory inside a symlinked path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4963
 2020-07-03 07:25:31 -04:00
Brad King 977f5ed3d1 Merge topic 'restore-cwd-translation-map' 
85a945a607 Restore handling of build directory inside a symlinked path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4963
 2020-07-03 07:25:31 -04:00
Kitware Robot bfa645c599 CMake Nightly Date Stamp 2020-07-03 00:03:17 -04:00
Brad King 29d2d4805f Merge topic 'refactor_cmmakefile_language_standards_methods' 
dc94b0249e cmStandardLevelResolver: Added to handle standard level queries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4932
 2020-07-02 08:39:26 -04:00
Brad King 4eb2e50730 Merge topic 'uv-check-return' 
0fddcc1e5b cmake: Tolerate nullptr from uv_default_loop

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !4962
 2020-07-02 08:31:31 -04:00
Brad King 85a945a607 Restore handling of build directory inside a symlinked path 
In commit dd8365b3f1 (Merge branch 'upstream-KWSys' into update-kwsys,
2020-04-06, v3.18.0-rc1~397^2) we imported KWSys commit `019afb6ea`
(SystemTools: Drop GetCurrentWorkingDirectory 'collapse' argument,
2020-04-03).  That caused `GetCurrentWorkingDirectory` to no longer send
paths through the KWSys translation map and broke CMake's detection of
the absolute path to a build directory containing a symbolic link.
Add our own `cmSystemTools::GetCurrentWorkingDirectory` wrapper around
the KWSys method in order to restore that mapping.

Test-case-by: Ben Boeckel <ben.boeckel@kitware.com>
Issue: #16228
Fixes: #20900
 2020-07-02 07:33:16 -04:00
Kitware Robot b028e8c50e CMake Nightly Date Stamp 2020-07-02 00:02:41 -04:00
Brad King 0fddcc1e5b cmake: Tolerate nullptr from uv_default_loop 
`uv_default_loop()` can return `nullptr` when running on a Linux kernel
configured without `CONFIG_EVENTFD`.

Fixes: #20899
 2020-07-01 16:26:44 -04:00
Robert Maynard dc94b0249e cmStandardLevelResolver: Added to handle standard level queries 
Refactored out of cmMakefile
 2020-07-01 07:58:58 -04:00
Brad King 1e26c84b96 CMake 3.18.0-rc3 2020-07-01 07:14:26 -04:00
Craig Scott 8975c2a55b Merge topic 'remove-warn-unused-vars' 
df6b077625 cmake: Remove broken '--warn-unused-vars' option

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !4953
 2020-07-01 07:03:54 -04:00
Brad King b7af2811ae Merge topic 'configure_file-permission-control' 
27b03281e2 configure_file: Add option to control file permissions transfer to copy

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4941
 2020-07-01 07:03:03 -04:00
Brad King 0ca6bb8575 Merge topic 'file-ARCHIVE-files-dirs' into release-3.18 
bbcff21f71 file(ARCHIVE*): Collapse FILES and DIRECTORY options

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4955
 2020-07-01 07:00:42 -04:00
Brad King 9c3e9881ef Merge topic 'file-ARCHIVE-files-dirs' 
bbcff21f71 file(ARCHIVE*): Collapse FILES and DIRECTORY options

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4955
 2020-07-01 07:00:42 -04:00
Kitware Robot 32cfb597f3 CMake Nightly Date Stamp 2020-07-01 00:02:06 -04:00
Rahul Gottipati 27b03281e2 configure_file: Add option to control file permissions transfer to copy 
Issue: #20866
 2020-06-30 11:20:41 -04:00
Brad King 221fd89251 Merge topic 'file-CONFIGURE-subdir' into release-3.18 
e5f5eeca2f file: Fix CONFIGURE output relative path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4951
 2020-06-30 08:04:07 -04:00
Brad King 947a518716 Merge topic 'file-CONFIGURE-subdir' 
e5f5eeca2f file: Fix CONFIGURE output relative path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4951
 2020-06-30 08:04:07 -04:00
Craig Scott bbcff21f71 file(ARCHIVE*): Collapse FILES and DIRECTORY options 
The two options were concatenated internally for both ARCHIVE_CREATE
and ARCHIVE_EXTRACT. The distinction between files and dirs was not
meaningful. Therefore, replace them with PATHS or PATTERNS 
to more accurately describe the way the options are used.

Fixes: #20884
 2020-06-30 22:01:35 +10:00
Brad King a939f962d7 Merge topic 'find_library-file-readable' 
f2c903fb9a find_library: Check that library files are readable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4945
 2020-06-30 07:25:54 -04:00