summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'vs-ConfigurationType-genex'Brad King2019-08-285-3/+13
|\ | | | | | | | | | | | | 8909a450a6 VS: Add support for generator expressions to VS_CONFIGURATION_TYPE Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3746
| * VS: Add support for generator expressions to VS_CONFIGURATION_TYPEDaniel Eiband2019-08-265-3/+13
| | | | | | | | | | | | | | | | Generator expressions in target property VS_CONFIGURATION_TYPE might be used to set the ConfigurationType to Utility for certain configurations to not build the target while still linking to the target in other configurations. Fixes: #19613
* | Merge topic 'sf-LANGUAGE-prop'Brad King2019-08-2810-37/+39
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 41ba3e28e6 Tests: Collect SourceFileProperty tests a40744c81a cmSourceFile: Move LANGUAGE to GetPropertyForUser 8cb3cffa42 cmSourceFile: Rename non-const GetLanguage Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3744
| * | Tests: Collect SourceFileProperty testsTushar Maheshwari2019-08-272-8/+7
| | | | | | | | | | | | | | | - Move the related test from COnly to SourceFileProperty - Cover `get_source_file_property` and `get_property(... SOURCE ...)`
| * | cmSourceFile: Move LANGUAGE to GetPropertyForUserTushar Maheshwari2019-08-273-11/+17
| | | | | | | | | | | | | | | | | | | | | | | | - 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
| * | cmSourceFile: Rename non-const GetLanguageTushar Maheshwari2019-08-278-21/+18
| | | | | | | | | | | | | | | | | | | | | | | | GetOrDetermineLanguage: - Read the property if available - Determine the Language using the file extension Fix all usage of the non-const member in the repository.
* | | Merge topic 'cpack-ifw-command-vectorization'Brad King2019-08-281-47/+72
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 9367f7dcdd CPack/IFW: Command vectorization Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3732
| * | | CPack/IFW: Command vectorizationKonstantin Podsvirov2019-08-271-47/+72
| | | | | | | | | | | | | | | | Fixes: #19634
* | | | Merge topic 'cmCommand_refactor_disallowed'Brad King2019-08-2821-300/+116
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 54872b73b9 cmCommand refactor: remove cmDisallowedCommand class 11f35d340e cmCommand refactor: remove unused AddDisallowedCommand overload ae51aa32f0 cmCommand refactor: cmVariableRequiresCommand 185fa2c4f3 cmCommand refactor: cmUtilitySourceCommand c8deeac68f cmCommand refactor: cmSubdirDependsCommand c2c222eba1 cmCommand refactor: cmOutputRequiredFilesCommand 7533e47ccc cmCommand refactor: cmLoadCommandCommand 9d6fc3f5ed cmCommand refactor: cmExportLibraryDependenciesCommand ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3736
| * | | | cmCommand refactor: remove cmDisallowedCommand classGabor Bencze2019-08-264-79/+0
| | | | |
| * | | | cmCommand refactor: remove unused AddDisallowedCommand overloadGabor Bencze2019-08-262-14/+0
| | | | |
| * | | | cmCommand refactor: cmVariableRequiresCommandGabor Bencze2019-08-263-27/+13
| | | | |
| * | | | cmCommand refactor: cmUtilitySourceCommandGabor Bencze2019-08-263-37/+25
| | | | |
| * | | | cmCommand refactor: cmSubdirDependsCommandGabor Bencze2019-08-263-18/+5
| | | | |
| * | | | cmCommand refactor: cmOutputRequiredFilesCommandGabor Bencze2019-08-263-43/+27
| | | | |
| * | | | cmCommand refactor: cmLoadCommandCommandGabor Bencze2019-08-253-30/+17
| | | | |
| * | | | cmCommand refactor: cmExportLibraryDependenciesCommandGabor Bencze2019-08-253-24/+12
| | | | |
| * | | | cmCommand refactor: cmUseMangledMesaCommandGabor Bencze2019-08-253-28/+17
| | | | |
* | | | | Merge branch 'release-3.15'Brad King2019-08-280-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge branch 'autogen_fix_use_after_move' into release-3.15Brad King2019-08-272-3/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !3745
* | \ \ \ \ \ Merge topic 'autogen_fix_use_after_move'Brad King2019-08-282-3/+3
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e32f70036c Autogen: Fix AUTOUIC segfault, when file includes colliding ui_*.h file Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3745
| * | | | | | Autogen: Fix AUTOUIC segfault, when file includes colliding ui_*.h fileSebastian Holtermann2019-08-272-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | CMake Nightly Date StampKitware Robot2019-08-281-1/+1
| | | | | | |
* | | | | | | Merge topic 'cmake-initial-cache-dirs'Brad King2019-08-2710-10/+51
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4ca0526f8a cmake: Pass -S and -B into PreLoad.cmake and -C scripts Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3709
| * | | | | | | cmake: Pass -S and -B into PreLoad.cmake and -C scriptsPeter Waller2019-08-2710-10/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this, it was not possible to see what the source or build directories were set to on the command line. Fixes: #19619
* | | | | | | | Merge topic 'xcode11-compatibility'Brad King2019-08-274-0/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3186bb91ed Xcode: Make iOS tests compatible with Xcode 11 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3743
| * | | | | | | | Xcode: Make iOS tests compatible with Xcode 11Gregor Jasny2019-08-264-0/+4
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge topic 'GNUInstallDirs-arch-linux'Brad King2019-08-271-1/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 18365587c8 GNUInstallDirs: Keep 'lib' as default LIBDIR on Arch Linux based systems Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3735
| * | | | | | | | GNUInstallDirs: Keep 'lib' as default LIBDIR on Arch Linux based systemsAntonio Rojas2019-08-261-1/+2
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Fixes: #15373
* | | | | | | | Merge topic 'swift-version'Brad King2019-08-274-0/+19
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 369c48ee43 Swift: honour `-swift-version` in Ninja generator Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3685
| * | | | | | | | Swift: honour `-swift-version` in Ninja generatorSaleem Abdulrasool2019-08-264-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | Merge topic 'ctest-CLICOLOR_FORCE'Brad King2019-08-271-0/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 074a6a8cf6 CTest: Add env var CLICOLOR_FORCE to force color output Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3733
| * | | | | | | | | CTest: Add env var CLICOLOR_FORCE to force color outputMarin Baron2019-08-261-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Base impl on `Source/kwsys/Terminal.c:kwsysTerminalStreamIsVT100`. This enables pipes/logs with colors.
* | | | | | | | | | Merge branch 'release-3.15'Brad King2019-08-270-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'alpine-cpu_zero' into release-3.15Brad King2019-08-271-0/+2
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3740
| * \ \ \ \ \ \ \ \ \ Merge branch 'cmGlobalGenerator-compilerId-lifetime' into release-3.15Brad King2019-08-271-7/+4
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3741
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'libarchive-requirement' into release-3.15Brad King2019-08-271-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3737
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ninja_additional_clean_files_custom_target' into release-3.15Brad King2019-08-273-37/+53
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3739
* | \ \ \ \ \ \ \ \ \ \ \ \ Merge topic 'alpine-cpu_zero'Brad King2019-08-271-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1902e39746 cmAffinity: Add include for CPU_ZERO on Alpine Linux Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3740
| * | | | | | | | | | | | | cmAffinity: Add include for CPU_ZERO on Alpine LinuxBrad King2019-08-271-0/+2
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | Merge topic 'cmGlobalGenerator-compilerId-lifetime'Brad King2019-08-271-7/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 17ce0c29ad cmGlobalGenerator: Fix CheckCompilerIdCompatibility local var lifetime Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3741
| * | | | | | | | | | | | cmGlobalGenerator: Fix CheckCompilerIdCompatibility local var lifetimeBrad King2019-08-261-7/+4
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Save the value of the compiler id variable in storage we own so that mutating it based on a policy does not invalidate the local value for later comparisons. This was identified by Clang AddressSanitizer.
* | | | | | | | | | | | Merge topic 'libarchive-requirement'Brad King2019-08-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 752fa8be9d libarchive: We now require at least version 3.3.3 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3737
| * | | | | | | | | | | libarchive: We now require at least version 3.3.3Marvin Schmidt2019-08-261-1/+1
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's the first version including Zstandard support.
* | | | | | | | | | | Merge topic 'ninja_additional_clean_files_custom_target'Brad King2019-08-273-37/+53
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | / / | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | Tests: Extend MakeClean test to test various target typesSebastian Holtermann2019-08-261-37/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This extends the MakeClean test to test the target property `ADDITIONAL_CLEAN_FILES` on executable, library and custom targets.
| * | | | | | | | | Ninja: Add support for ADDITIONAL_CLEAN_FILES in custom targetsSebastian Holtermann2019-08-262-0/+4
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This enables the support for `ADDITIONAL_CLEAN_FILES` in custom targets using the ninja generator. Fixes: #19641
* | | | | | | | | CMake Nightly Date StampKitware Robot2019-08-271-1/+1
| |_|_|_|_|/ / / |/| | | | | | |
* | | | | | | | Merge topic 'pvs-cleanup'Brad King2019-08-268-45/+27
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | cmCPackLog: Fix support for multiple log message tagsBrad King2019-08-261-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix logic from commit bbf1c2d275 (ENH: More improvements and add logging, 2006-01-02, v2.4.0~712) to append to the accumulated tag string instead of overwriting it for each type of message. Issue: #19610