summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* clang-format: Normalize headers presentationMarc Chevrier2019-10-0111-4/+44
| | | | | | | | | | | | | | | | | By using clang-format directives 'IncludeBlocks' and 'IncludeCategories' headers are regrouped by categories: 1. "cmConfigure.h" which must be first 2. header matching current implementation file 3. standard language headers 4. CMake replacement ones 5. external headers (i.e. #include directive with '<' and '>') 6. Qt headers 7. cmsys/* headers 8. cm_* headers 9. CMake headers (i.e. starting with 'cm[A-Z]') 10. all other headers Fixes: #19674
* Remove unused uid_t/gid_t types on WindowsBrad King2019-10-011-5/+0
| | | | | | | These were added and used by commit 5299141320 (CPackDeb: Enable the DEB generator on Windows, 2017-06-17, v3.10.0-rc1~445^2) but have not been used since commit df556e65f2 (cmCPackDebGenerator: Use libarchive to create .deb file, 2017-08-24, v3.10.0-rc1~220^2).
* Merge topic 'fix-EXCLUDE_FROM_ALL-subdir-all'Brad King2019-10-0116-150/+171
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8a15e75fe3 Tests: Cover EXCLUDE_FROM_ALL OFF on sub/sub/tgt in sub/all 7420843370 Makefiles: Fix EXCLUDE_FROM_ALL OFF on sub/sub/tgt in sub/all d713bcb642 Ninja: Factor out per-dir "all" target computation into common generator a75586c775 Ninja: Simplify top-level "all" target generation a49cd4d1a7 Ninja: Fix EXCLUDE_FROM_ALL OFF on sub/sub/tgt in sub/all 0733a94f64 Ninja,Makefile: Fix subdir "all" with nested EXCLUDE_FROM_ALL subdir 11fb377eb9 cmLocalUnixMakefileGenerator3: Mark GetRelativeTargetDirectory const be7857f40d cmLocalCommonGenerator: Mark GetConfigName as const ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3869
| * Tests: Cover EXCLUDE_FROM_ALL OFF on sub/sub/tgt in sub/allBrad King2019-09-304-0/+5
| | | | | | | | Issue: #19753
| * Makefiles: Fix EXCLUDE_FROM_ALL OFF on sub/sub/tgt in sub/allBrad King2019-09-302-62/+31
| | | | | | | | | | | | | | | | Defer adding a test to a later commit after all generators have been fixed. Issue: #19753 Co-Author: Sebastian Holtermann <sebholt@xwmw.org>
| * Ninja: Factor out per-dir "all" target computation into common generatorBrad King2019-09-303-58/+112
| | | | | | | | This will make it re-usable for the Makefile generator.
| * Ninja: Simplify top-level "all" target generationBrad King2019-09-303-49/+14
| | | | | | | | | | Remove its dedicated implementation and update the per-directory "all" target generation to work for the top-level directory too.
| * Ninja: Fix EXCLUDE_FROM_ALL OFF on sub/sub/tgt in sub/allBrad King2019-09-301-2/+19
| | | | | | | | | | | | | | Defer adding a test to a later commit after all generators have been fixed. Issue: #19753
| * Ninja,Makefile: Fix subdir "all" with nested EXCLUDE_FROM_ALL subdirBrad King2019-09-308-0/+16
| | | | | | | | | | | | | | | | | | | | The "all" target defined for a subdirectory (e.g. `cd sub; make` or `ninja sub/all`) should not include the "all" targets from nested subdirectories (e.g. `sub/sub`) that are marked as `EXCLUDE_FROM_ALL`. Fix this and add a test case. Issue: #19753 Co-Author: Sebastian Holtermann <sebholt@xwmw.org>
| * cmLocalUnixMakefileGenerator3: Mark GetRelativeTargetDirectory constBrad King2019-09-302-2/+3
| |
| * cmLocalCommonGenerator: Mark GetConfigName as constBrad King2019-09-301-1/+1
| |
| * cmGlobalNinjaGenerator: Remove unused AddDependencyToAll overloadBrad King2019-09-302-6/+0
| |
* | Merge topic 'typos'Brad King2019-10-014-5/+5
|\ \ | | | | | | | | | | | | | | | | | | ab06de68c5 Help: fixed typos in PCH / Unity Build doc Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3870
| * | Help: fixed typos in PCH / Unity Build docCorentin Plouet2019-09-304-5/+5
| | | | | | | | | | | | + typos in source code
* | | Merge topic 'FindCurses-ncursesw'Brad King2019-10-011-4/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 048860e172 FindCurses: toplevel ncursesw support, recover cflags Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3845
| * | | FindCurses: toplevel ncursesw support, recover cflagsnick black2019-09-281-4/+12
| | | |
* | | | CMake Nightly Date StampKitware Robot2019-10-011-1/+1
| | | |
* | | | Merge branch 'release-3.15'Brad King2019-09-300-0/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | CMake 3.15.4v3.15.4Brad King2019-09-301-1/+1
| | | |
* | | | Merge branch 'release-3.14'Brad King2019-09-300-0/+0
|\ \ \ \
| * | | | CMake 3.14.7v3.14.7Brad King2019-09-301-1/+1
| | | | |
* | | | | Merge branch 'release-3.15'Brad King2019-09-300-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'backport-3.15-fix-EXCLUDE_FROM_ALL-subdir-all' into release-3.15Brad King2019-09-3021-106/+202
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !3863
* | \ \ \ \ Merge branch 'release-3.14'Brad King2019-09-300-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | / | |_|_|_|/ |/| | | |
| * | | | Merge branch 'backport-3.14-fix-EXCLUDE_FROM_ALL-subdir-all' into release-3.14Brad King2019-09-3020-102/+170
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !3863
* | \ \ \ \ Merge topic 'fix-EXCLUDE_FROM_ALL-subdir-all'Brad King2019-09-3021-106/+202
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dce58afd30 Merge branch 'backport-3.15-fix-EXCLUDE_FROM_ALL-subdir-all' 013d7dd484 Help: Mention 3.14.7 EXCLUDE_FROM_ALL fix in 3.15.4 release note 61103c0bac Merge branch 'backport-3.14-fix-EXCLUDE_FROM_ALL-subdir-all' 1fe4501592 Help: Add release note for EXCLUDE_FROM_ALL fix in 3.15.4 05d7ca14e9 Merge branch 'backport-3.14-fix-EXCLUDE_FROM_ALL-subdir-all' 62d45d91e8 Help: Add release note for EXCLUDE_FROM_ALL fix in 3.14.7 b3b1c7bf3a Restore "all" target in subdirectories marked EXCLUDE_FROM_ALL 156b56480a Makefiles: Revert "Make build root targets ... recursive" ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3863
| * \ \ \ \ \ Merge branch 'backport-3.15-fix-EXCLUDE_FROM_ALL-subdir-all'Brad King2019-09-3021-106/+202
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve conflicts with changes since the 3.15 series: * Convert `cmSystemTools::IsOn` => `cmIsOn`. * Move one "EXCLUDE_FROM_ALL" target property logic fix to its new location in `cmMakefile::AddNewUtilityTarget`.
| | * | | | | Help: Mention 3.14.7 EXCLUDE_FROM_ALL fix in 3.15.4 release noteBrad King2019-09-301-0/+1
| | | | | | |
| | * | | | | Merge branch 'backport-3.14-fix-EXCLUDE_FROM_ALL-subdir-all'Brad King2019-09-301-0/+8
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Help: Add release note for EXCLUDE_FROM_ALL fix in 3.14.7Brad King2019-09-301-0/+8
| | | | | | |
| | * | | | | Help: Add release note for EXCLUDE_FROM_ALL fix in 3.15.4Brad King2019-09-301-0/+8
| | | | | | |
| | * | | | | Merge branch 'backport-3.14-fix-EXCLUDE_FROM_ALL-subdir-all'Brad King2019-09-3019-102/+162
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Restore "all" target in subdirectories marked EXCLUDE_FROM_ALLBrad King2019-09-3017-38/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "all" target in each directory is supposed to have targets from that directory even if the directory itself is marked `EXCLUDE_FROM_ALL` in its parent. This was broken by commit dc6888573d (Pass EXCLUDE_FROM_ALL from directory to targets, 2019-01-15, v3.14.0-rc1~83^2) which made the participation of a target in "all" independent of context. Revert much of the logic change from that commit to restore the old behavior. Then re-implement the behavior intended by the commit to keep its test working. Extend the test to cover the old behavior too. Fixes: #19753
| | | * | | | Tests: Clarify target names in RunCMake.add_subdirectory ExcludeFromAllBrad King2019-09-264-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename the `baz` target to `subinc` to clarify that its role is to be included even though it is in an otherwise excluded subdirectory.
| | | * | | | Tests: Revise RunCMake.add_subdirectory ExcludeFromAll to avoid globbingBrad King2019-09-264-61/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also simplify the clean step.
| | | * | | | Tests: Teach RunCMake to support a custom working directoryBrad King2019-09-241-1/+4
| | | |/ / /
| | * | | | Makefiles: Revert "Make build root targets ... recursive"Brad King2019-09-271-5/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert the main logic change from commit 827da1119e (Makefiles: Make build root targets "all", "clean" and "preinstall" recursive, 2019-05-17, v3.15.0-rc1~96^2~2) for the "all" and "preinstall" targets. The commit cleaned up the Makefile generator to use the same logic for the "all" target in the top-level directory as for subdirectories. It exposed a long-existing bug that caused the "all" target in a subdirectory to include the "all" targets from sub-subdirectories even if they are marked `EXCLUDE_FROM_ALL`. The `Tests/SubDir` test should fail but the problem is currently covered up by another bug introduced by commit dc6888573d (Pass EXCLUDE_FROM_ALL from directory to targets, 2019-01-15, v3.14.0-rc1~83^2) that causes the "all" targets in `EXCLUDE_FROM_ALL` subdirectories to be empty. Revert the top-level "all" and "preinstall" targets to the old approach to prepare to fix the latter bug without exposing the long-existing bug at the top-level. Leave the "clean" target in the new approach because it does not honor `EXCLUDE_FROM_ALL` anyway. Issue: #19753
* | | | | | Merge topic 'objective-c-cxx'Brad King2019-09-3072-81/+2787
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dd0f304613 Objective C/C++: Add compiler standard detection b515af782b Help: Add release note for Objective-C/C++ language support 9e66397c28 Languages: Add support for Objective-C++ 80f120a85f Languages: Add support for Objective-C Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3811
| * | | | | | Objective C/C++: Add compiler standard detectionCristian Adam2019-09-284-72/+108
| | | | | | |
| * | | | | | Help: Add release note for Objective-C/C++ language supportCristian Adam2019-09-281-0/+9
| | | | | | |
| * | | | | | Languages: Add support for Objective-C++Steve Wilson2019-09-2839-32/+1453
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add entries in Modules and Modules/Platform to support Objective-C++ compiler determination and identification. Add Modules to check Objective-C++ compiler flags, source compilations, program checks, etc... Use OBJCXX as the designator of the language, eg: project(foo OBJCXX) Add various tests for Objective-C++ language features. Add tests to preserve C++ handling of .M and .mm files when Objective-C++ is not a configured language. Co-authored-by: Cristian Adam <cristian.adam@gmail.com>
| * | | | | | Languages: Add support for Objective-CSteve Wilson2019-09-2839-8/+1248
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add entries in Modules and Modules/Platform to support Objective-C compiler determination and identification. Add Modules to check Objective-C compiler flags, source compilations, program checks, etc... Use OBJC as the designator of the language, eg: project(foo OBJC) Add various tests for Objective-C language features. Add tests to preserve C++ handling of .m and .mm files when OBJC is not a configured language. Co-Authored-By: Cristian Adam <cristian.adam@gmail.com>
* | | | | | | Merge topic 'autogen_free_functions'Brad King2019-09-307-977/+1014
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6bd40ccf84 Autogen: Make cmQtAutoMocUic a free function e0e9be3d57 Autogen: Make cmQtAutoRcc a free function 820962edc9 Autogen: Refactor json info file reading interface Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3867
| * | | | | | | Autogen: Make cmQtAutoMocUic a free functionSebastian Holtermann2019-09-283-650/+635
| | | | | | | |
| * | | | | | | Autogen: Make cmQtAutoRcc a free functionSebastian Holtermann2019-09-283-83/+95
| | | | | | | |
| * | | | | | | Autogen: Refactor json info file reading interfaceSebastian Holtermann2019-09-287-248/+288
| | | | | | | |
* | | | | | | | Merge topic 'FPHSA-reason-failure-message'Brad King2019-09-3015-6/+96
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 60473cc660 FPHSA: add capability to specify message explaining reason of failure Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3866
| * | | | | | | | FPHSA: add capability to specify message explaining reason of failureMarc Chevrier2019-09-2715-6/+96
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Fixes: #19660
* | | | | | | | Merge topic 'smart_ptr/cmCurses'Brad King2019-09-308-203/+157
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7d6e08b438 cmCursesMainForm: change Entries to object vector 0833486d62 cmCursesStringWidget: remove manual delete bc71b253cb cmCursesCacheEntryComposite: default destructor 36875ff419 cmCursesMainForm: cleanup manual allocation 2b16071149 CursesDialog: modernize CMake usage Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3849
| * | | | | | | | cmCursesMainForm: change Entries to object vectorTushar Maheshwari2019-09-273-47/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add move constructor and move assignment operator for `cmCursesCacheEntryComposite`. - Transfer ownership of Entries objects to std::vector.