summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CMake Nightly Date StampKitware Robot2019-10-031-1/+1
|
* Merge topic 'ninja-depend-shared-symlinks'Brad King2019-10-023-2/+48
|\ | | | | | | | | | | | | 4891f0f966 Ninja: Ensure shared library version symlinks are created for dependents Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3875
| * Ninja: Ensure shared library version symlinks are created for dependentsBrad King2019-10-013-2/+48
| | | | | | | | | | | | | | | | When linking to a shared library target that has version symlinks, add an order-only dependency on the build statement that creates the links. This ensures that the links exist for use at runtime. Fixes: #19774
* | Merge topic 'clang-format-normalize-headers-presentation'Brad King2019-10-02611-1733/+2070
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | ed98209ddc Revise include order using clang-format-6.0 185fe49f29 clang-format: Normalize headers presentation 42ef28b4f3 Remove unused uid_t/gid_t types on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Sebastian Holtermann <sebholt@web.de> Merge-request: !3851
| * | Revise include order using clang-format-6.0Kitware Robot2019-10-01599-1724/+2026
| | | | | | | | | | | | | | | Run the `clang-format.bash` script to update our C and C++ code to a new include order `.clang-format`. Use `clang-format` version 6.0.
| * | 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 branch 'release-3.15'Brad King2019-10-020-0/+0
|\ \
| * \ Merge branch 'vs-v142-version' into release-3.15Brad King2019-10-012-2/+10
| |\ \ | | | | | | | | | | | | Merge-request: !3874
* | \ \ Merge topic 'xcode-debug-document-versioning'Brad King2019-10-029-3/+64
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 67200c37b0 xcode: Add XCODE_SCHEME_DEBUG_DOCUMENT_VERSIONING property Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3876
| * | | | xcode: Add XCODE_SCHEME_DEBUG_DOCUMENT_VERSIONING propertyGregor Jasny2019-10-019-3/+64
| | | | |
* | | | | Merge topic 'pch-compile-pdb'Brad King2019-10-026-0/+59
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e6e189e02b PCH: Report error when setting COMPILE_PDB_NAME property Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3864
| * | | | | PCH: Report error when setting COMPILE_PDB_NAME propertyCristian Adam2019-10-016-0/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reusable precompile headers require specific COMPILE_PDB_NAME property values. Report error if the user tries to set a different value.
* | | | | | Merge topic 'vs-v142-version'Brad King2019-10-022-2/+10
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 5117389931 VS: Fix support for v142 toolset minor versions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3874
| * | | | | VS: Fix support for v142 toolset minor versionsBrad King2019-10-012-2/+10
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using `-T v142,version=14.22` the `.props` file location is different starting with version `14.20` than it was in `14.16` and below. Adapt the path based on the version. Fixes: #19779
* | | | | Merge topic 'test-iface-paths'Brad King2019-10-028-13/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 335236b0cb Tests: Shorten name RunCMake.IfacePaths_{INCLUDE_DIRECTORIES => INCDIRS} Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3873
| * | | | | Tests: Shorten name RunCMake.IfacePaths_{INCLUDE_DIRECTORIES => INCDIRS}Brad King2019-10-018-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original name was responsible for the longest path in our build tree. Use a shorter name to enable longer build tree names on Windows.
* | | | | | CMake Nightly Date StampKitware Robot2019-10-021-1/+1
| |_|_|_|/ |/| | | |
* | | | | 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.
generated by cgit v0.12 at 2025-01-31 01:16:17 (GMT)