mirrors/cmake
2
0 Fork 0
mirror of https://gitlab.kitware.com/cmake/cmake.git synced 2026-10-05 04:03:22 +03:00
Code Activity
47,352 Commits 2 Branches 415 Tags
94de927cab19609aeeff032c64f16cfd257fca2f
Commit Graph
47352 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tushar Maheshwari 41ba3e28e6 Tests: Collect SourceFileProperty tests 
- Move the related test from COnly to SourceFileProperty
- Cover `get_source_file_property` and `get_property(... SOURCE ...)`
 2019-08-27 22:28:34 +05:30
Tushar Maheshwari a40744c81a cmSourceFile: Move LANGUAGE to GetPropertyForUser 
- Remove the special case from cmGetSourceFilePropertyCommand

Tests: check LANGUAGE for source file
- use target_sources to add file
- use get_property to read property value
 2019-08-27 21:41:12 +05:30
Tushar Maheshwari 8cb3cffa42 cmSourceFile: Rename non-const GetLanguage 
GetOrDetermineLanguage:
- Read the property if available
- Determine the Language using the file extension

Fix all usage of the non-const member in the repository.
 2019-08-27 21:35:42 +05:30
Sebastian Holtermann 32b15d320f Autogen: cmQtAutoMocUic settings hash computation optimizations 2019-08-27 17:31:46 +02:00
Sebastian Holtermann b66cd3fe63 Autogen: cmQtAutoMocUic string concatenation cleanups 2019-08-27 17:31:46 +02:00
Sebastian Holtermann 619a92eacd Autogen: cmQtAutoRcc settings hash computation optimizations 2019-08-27 17:31:46 +02:00
Sebastian Holtermann 10dc684508 Autogen: cmQtAutoRcc string concatenation cleanups 2019-08-27 17:31:46 +02:00
Sebastian Holtermann da6c4b1273 Autogen: cmQtAutoGenInitializer string concatenation cleanups 2019-08-27 17:31:46 +02:00
Sebastian Holtermann 7a78d15415 Autogen: Let cmQtAutoGenerator::Logger methods accept cm::string_view 2019-08-27 17:31:45 +02:00
Sebastian Holtermann c797148e85 Autogen: Use cm::string_view for AUTO{MOC,UIC,RCC} generator names 
- Store `AUTO{MOC,UIC,RCC}` generator name as `cm::string_view`
- Use `std::initializer_list` instead of `std::array`
 2019-08-27 17:31:45 +02:00
Sebastian Holtermann 8586077baa Autogen: Modernize cmQtAutoGen methods using cm::string_view 2019-08-27 17:31:45 +02:00
Konstantin Podsvirov 9367f7dcdd CPack/IFW: Command vectorization 
Fixes: #19634
 2019-08-27 11:30:19 -04:00
Brad King 843ab7544e Merge topic 'cmake-initial-cache-dirs' 
4ca0526f8a cmake: Pass -S and -B into PreLoad.cmake and -C scripts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3709
 2019-08-27 11:23:22 -04:00
Brad King 57fc6c587a Merge topic 'xcode11-compatibility' 
3186bb91ed Xcode: Make iOS tests compatible with Xcode 11

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3743
 2019-08-27 11:00:53 -04:00
Brad King bd4d52f7de Merge topic 'GNUInstallDirs-arch-linux' 
18365587c8 GNUInstallDirs: Keep 'lib' as default LIBDIR on Arch Linux based systems

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3735
 2019-08-27 10:58:28 -04:00
Brad King 613ac3e7d5 Merge topic 'swift-version' 
369c48ee43 Swift: honour `-swift-version` in Ninja generator

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3685
 2019-08-27 10:57:26 -04:00
Brad King d16402ddc4 Merge topic 'ctest-CLICOLOR_FORCE' 
074a6a8cf6 CTest: Add env var CLICOLOR_FORCE to force color output

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3733
 2019-08-27 10:54:24 -04:00
Peter Waller 4ca0526f8a cmake: Pass -S and -B into PreLoad.cmake and -C scripts 
Before this, it was not possible to see what the source or build directories
were set to on the command line.

Fixes: #19619
 2019-08-27 10:51:40 -04:00
Brad King 1d953058a2 Merge branch 'autogen_fix_use_after_move' into release-3.15 
Merge-request: !3745
 2019-08-27 10:25:53 -04:00
Brad King 52a8fb2d53 Merge branch 'release-3.15' 2019-08-27 10:24:57 -04:00
Brad King 4a4001477d Merge topic 'alpine-cpu_zero' 
1902e39746 cmAffinity: Add include for CPU_ZERO on Alpine Linux

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3740
 2019-08-27 10:20:50 -04:00
Brad King 297df45d00 Merge topic 'cmGlobalGenerator-compilerId-lifetime' 
17ce0c29ad cmGlobalGenerator: Fix CheckCompilerIdCompatibility local var lifetime

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3741
 2019-08-27 10:18:57 -04:00
Sebastian Holtermann e32f70036c Autogen: Fix AUTOUIC segfault, when file includes colliding ui_*.h file 
This fixes a case of use after move of a `std::shared_ptr` in `AUTOUIC`.

It triggered a segfault, when the error message for colliding `ui_*.h`
includes in different files was computed.
 2019-08-27 10:17:33 -04:00
Brad King 8a8b2fa695 Merge topic 'libarchive-requirement' 
752fa8be9d libarchive: We now require at least version 3.3.3

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3737
 2019-08-27 10:17:20 -04:00
Brad King 2a2c4cc722 Merge topic 'ninja_additional_clean_files_custom_target' 
d040f3f1ee Tests: Extend MakeClean test to test various target types
3ed8cffe73 Ninja: Add support for ADDITIONAL_CLEAN_FILES in custom targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3739
 2019-08-27 10:16:05 -04:00
Brad King 1d68639654 Merge branch 'alpine-cpu_zero' into release-3.15 
Merge-request: !3740
 2019-08-27 10:11:37 -04:00
Brad King 6157c0fe84 Merge branch 'cmGlobalGenerator-compilerId-lifetime' into release-3.15 
Merge-request: !3741
 2019-08-27 10:11:29 -04:00
Brad King dd6154ca19 Merge branch 'libarchive-requirement' into release-3.15 
Merge-request: !3737
 2019-08-27 10:11:16 -04:00
Brad King b0566f62eb Merge branch 'ninja_additional_clean_files_custom_target' into release-3.15 
Merge-request: !3739
 2019-08-27 10:11:06 -04:00
Brad King 1902e39746 cmAffinity: Add include for CPU_ZERO on Alpine Linux 
The definition of `CPU_ZERO` requires `<string.h>` to be included
explicitly for `memset`.  Since IWYU does not agree on other Linux
platforms, use a pragma to silence the warning.

Fixes: #19643
 2019-08-27 09:32:32 -04:00
Benjamin Wozniak df0247a371 cuda: Extend toolset argument to accept path 
Previously cuda could only be used with cmake if it is
installed globally on the system. Sometimes this is not
possible (eg docker, packaging with conan, etc.).
Thus the cuda toolset argument is extended to take
a path to a cuda install directory.
 2019-08-27 12:54:35 +02:00
Daniel Pfeifer 375d01c680 PCH: add example/test 2019-08-27 12:50:08 +02:00
Daniel Pfeifer 9b6797e71d PCH: add target_precompile_headers command 2019-08-27 12:49:53 +02:00
Kitware Robot 65fe80794d CMake Nightly Date Stamp 2019-08-27 00:01:03 -04:00
Gregor Jasny 3186bb91ed Xcode: Make iOS tests compatible with Xcode 11 2019-08-26 21:08:00 +02:00
Daniel Pfeifer 0467a2f91b PCH: add PRECOMPILE_HEADERS to special properties 2019-08-26 18:16:42 +02:00
Gabor Bencze 54872b73b9 cmCommand refactor: remove cmDisallowedCommand class 2019-08-26 11:48:47 -04:00
Gabor Bencze 11f35d340e cmCommand refactor: remove unused AddDisallowedCommand overload 2019-08-26 11:48:47 -04:00
Gabor Bencze ae51aa32f0 cmCommand refactor: cmVariableRequiresCommand 2019-08-26 11:48:46 -04:00
Gabor Bencze 185fa2c4f3 cmCommand refactor: cmUtilitySourceCommand 2019-08-26 11:48:46 -04:00
Gabor Bencze c8deeac68f cmCommand refactor: cmSubdirDependsCommand 2019-08-26 11:48:46 -04:00
Gabor Bencze c2c222eba1 cmCommand refactor: cmOutputRequiredFilesCommand 2019-08-26 11:48:43 -04:00
Saleem Abdulrasool 369c48ee43 Swift: honour -swift-version in Ninja generator 
Swift has supported `CMAKE_Swift_LANGUAGE_VERSION` and
`Swift_LANGUAGE_VERSION` but didn't apply that to Ninja generated
targets.  Consider the property when calculating the flags.
 2019-08-26 11:38:40 -04:00
Antonio Rojas 18365587c8 GNUInstallDirs: Keep 'lib' as default LIBDIR on Arch Linux based systems 
Fixes: #15373
 2019-08-26 11:14:13 -04:00
Marin Baron 074a6a8cf6 CTest: Add env var CLICOLOR_FORCE to force color output 
Base impl on `Source/kwsys/Terminal.c:kwsysTerminalStreamIsVT100`.
This enables pipes/logs with colors.
 2019-08-26 11:04:57 -04:00
Brad King 89479bde94 Merge topic 'pvs-cleanup' 
7fe3e874d5 cmCPackLog: Fix support for multiple log message tags
74f2c0ea56 cmCTestTestHandler: Remove extra layer of parentheses
7c2767ef3b cmCTestMultiProcessHandler: Explain testRun ownership in comments
303e813438 CTest: Simplify some boolean conditions
51565abe79 cmMessageCommand: Remove extra layer of parentheses
b1cfaf7b91 cmVSSetupHelper: Remove unused SmartBSTR copy operations
3f4c4e7afe cmVSSetupHelper: Fix SmartBSTR copy operations
a8ca5aea94 cmMakefileTargetGenerator: Check for null before using a pointer
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Daniel Pfeifer <daniel@pfeifer-mail.de>
Acked-by: Artalus <artalus-mail@yandex.ru>
Merge-request: !3715
 2019-08-26 10:51:11 -04:00
Brad King 37c671570c Merge topic 'source_sweep_ostringstream_single' 
3b2b02825d Source sweep: Replace std::ostringstream when used with a single append

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3726
 2019-08-26 10:49:10 -04:00
Brad King 8685d0d291 Merge topic 'source_sweep_cmExpandedList' 
aaf59120bf Source sweep: Replace cmExpandList with the shorter cmExpandedList

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3725
 2019-08-26 10:47:24 -04:00
Brad King 7290cea75b Merge topic 'FindLibLZMA-windows-debug' 
232f5bd644 FindLibLZMA: Find debug/release variants on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3714
 2019-08-26 10:45:28 -04:00
Brad King bd3fb4c462 Merge topic 'list-subcommand-table' 
b14bcd9123 cmListCommand: Use cmSubcommandTable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3723
 2019-08-26 10:43:06 -04:00