mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-01 04:08:46 -06:00
Code Issues Packages Projects Releases Wiki Activity
45,248 Commits 2 Branches 391 Tags
0c5f78478ee6005f84c53ef7df3182fa208222f8
Commit Graph

45248 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
0c5f78478e Merge topic 'xcode-debug-document-versioning' 
67200c37b0 xcode: Add XCODE_SCHEME_DEBUG_DOCUMENT_VERSIONING property

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3876
 2019-10-02 07:51:06 -04:00
Brad King
9649c91f83 Merge topic 'pch-compile-pdb' 
e6e189e02b PCH: Report error when setting COMPILE_PDB_NAME property

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3864
 2019-10-02 07:48:55 -04:00
Brad King
20e9151e6c Merge topic 'vs-v142-version' 
5117389931 VS: Fix support for v142 toolset minor versions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3874
 2019-10-02 07:47:25 -04:00
Brad King
c5bec56611 Merge topic 'test-iface-paths' 
335236b0cb Tests: Shorten name RunCMake.IfacePaths_{INCLUDE_DIRECTORIES => INCDIRS}

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3873
 2019-10-02 07:41:39 -04:00
Kitware Robot
f3ba8bf402 CMake Nightly Date Stamp 2019-10-02 00:01:11 -04:00
Gregor Jasny
67200c37b0 xcode: Add XCODE_SCHEME_DEBUG_DOCUMENT_VERSIONING property 2019-10-01 23:02:35 +02:00
Cristian Adam
e6e189e02b PCH: Report error when setting COMPILE_PDB_NAME property 
Reusable precompile headers require specific COMPILE_PDB_NAME property
values. Report error if the user tries to set a different value.
 2019-10-01 18:33:40 +02:00
Brad King
62d65286e7 Merge topic 'fix-EXCLUDE_FROM_ALL-subdir-all' 
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
 2019-10-01 12:25:13 -04:00
Brad King
5117389931 VS: Fix support for v142 toolset minor versions 
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
 2019-10-01 11:39:38 -04:00
Brad King
ec16afc9e8 Merge topic 'typos' 
ab06de68c5 Help: fixed typos in PCH / Unity Build doc

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3870
 2019-10-01 11:06:22 -04:00
Brad King
7ad49fa333 Merge topic 'FindCurses-ncursesw' 
048860e172 FindCurses: toplevel ncursesw support, recover cflags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3845
 2019-10-01 11:03:18 -04:00
Brad King
335236b0cb Tests: Shorten name RunCMake.IfacePaths_{INCLUDE_DIRECTORIES => INCDIRS} 
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.
 2019-10-01 10:53:39 -04:00
Kitware Robot
a06472b168 CMake Nightly Date Stamp 2019-10-01 00:01:08 -04:00
Brad King
d5efd8ed72 Merge branch 'release-3.15' 2019-09-30 16:37:39 -04:00
Corentin Plouet
ab06de68c5 Help: fixed typos in PCH / Unity Build doc 
+ typos in source code
 2019-10-01 05:33:50 +10:00
Brad King
6fb747a01c CMake 3.15.4 v3.15.4 2019-09-30 15:30:00 -04:00
Brad King
6fa2baef61 Merge branch 'release-3.14' 2019-09-30 15:05:41 -04:00
Brad King
6d01a8e004 CMake 3.14.7 v3.14.7 2019-09-30 14:01:30 -04:00
Brad King
acbe5ae049 Merge branch 'release-3.15' 2019-09-30 10:43:47 -04:00
Brad King
fcd7b53d95 Merge branch 'release-3.14' 2019-09-30 10:43:37 -04:00
Brad King
8a15e75fe3 Tests: Cover EXCLUDE_FROM_ALL OFF on sub/sub/tgt in sub/all 
Issue: #19753
 2019-09-30 10:34:23 -04:00
Brad King
7420843370 Makefiles: Fix EXCLUDE_FROM_ALL OFF on sub/sub/tgt in sub/all 
Defer adding a test to a later commit after all generators have been
fixed.

Issue: #19753
Co-Author: Sebastian Holtermann <sebholt@xwmw.org>
 2019-09-30 10:34:23 -04:00
Brad King
d713bcb642 Ninja: Factor out per-dir "all" target computation into common generator 
This will make it re-usable for the Makefile generator.
 2019-09-30 10:33:20 -04:00
Brad King
a75586c775 Ninja: Simplify top-level "all" target generation 
Remove its dedicated implementation and update the per-directory "all"
target generation to work for the top-level directory too.
 2019-09-30 10:30:28 -04:00
Brad King
a49cd4d1a7 Ninja: Fix EXCLUDE_FROM_ALL OFF on sub/sub/tgt in sub/all 
Defer adding a test to a later commit after all generators have been
fixed.

Issue: #19753
 2019-09-30 10:30:28 -04:00
Brad King
0733a94f64 Ninja,Makefile: Fix subdir "all" with nested EXCLUDE_FROM_ALL subdir 
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>
 2019-09-30 10:30:28 -04:00
Brad King
11fb377eb9 cmLocalUnixMakefileGenerator3: Mark GetRelativeTargetDirectory const 2019-09-30 10:30:28 -04:00
Brad King
be7857f40d cmLocalCommonGenerator: Mark GetConfigName as const 2019-09-30 10:30:28 -04:00
Brad King
4a92df8667 cmGlobalNinjaGenerator: Remove unused AddDependencyToAll overload 2019-09-30 10:30:28 -04:00
Brad King
e7637a3d1a Merge branch 'backport-3.15-fix-EXCLUDE_FROM_ALL-subdir-all' into release-3.15 
Merge-request: !3863
 2019-09-30 10:29:11 -04:00
Brad King
73dad4708f Merge branch 'backport-3.14-fix-EXCLUDE_FROM_ALL-subdir-all' into release-3.14 
Merge-request: !3863
 2019-09-30 10:28:20 -04:00
Brad King
8aa5f6ba44 Merge topic 'fix-EXCLUDE_FROM_ALL-subdir-all' 
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
 2019-09-30 10:27:15 -04:00
Brad King
9b03baee30 Merge topic 'objective-c-cxx' 
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
 2019-09-30 10:25:19 -04:00
Brad King
b24e501bc2 Merge topic 'autogen_free_functions' 
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
 2019-09-30 10:23:42 -04:00
Brad King
c2d1ea58bf Merge topic 'FPHSA-reason-failure-message' 
60473cc660 FPHSA: add capability to specify message explaining reason of failure

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3866
 2019-09-30 10:22:35 -04:00
Brad King
45507eeb6a Merge topic 'smart_ptr/cmCurses' 
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
 2019-09-30 10:21:38 -04:00
Brad King
dce58afd30 Merge branch 'backport-3.15-fix-EXCLUDE_FROM_ALL-subdir-all' 
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`.
 2019-09-30 09:34:57 -04:00
Brad King
013d7dd484 Help: Mention 3.14.7 EXCLUDE_FROM_ALL fix in 3.15.4 release note 2019-09-30 09:20:55 -04:00
Brad King
61103c0bac Merge branch 'backport-3.14-fix-EXCLUDE_FROM_ALL-subdir-all' 2019-09-30 09:20:40 -04:00
Brad King
1fe4501592 Help: Add release note for EXCLUDE_FROM_ALL fix in 3.15.4 2019-09-30 09:20:35 -04:00
Brad King
05d7ca14e9 Merge branch 'backport-3.14-fix-EXCLUDE_FROM_ALL-subdir-all' 2019-09-30 09:19:21 -04:00
Brad King
62d45d91e8 Help: Add release note for EXCLUDE_FROM_ALL fix in 3.14.7 2019-09-30 09:18:20 -04:00
Brad King
b3b1c7bf3a Restore "all" target in subdirectories marked EXCLUDE_FROM_ALL 
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
 2019-09-30 09:18:20 -04:00
Kitware Robot
3f7829fc4f CMake Nightly Date Stamp 2019-09-30 00:01:05 -04:00
Kitware Robot
c174e603be CMake Nightly Date Stamp 2019-09-29 00:01:05 -04:00
Sebastian Holtermann
6bd40ccf84 Autogen: Make cmQtAutoMocUic a free function 2019-09-29 00:07:32 +02:00
Sebastian Holtermann
e0e9be3d57 Autogen: Make cmQtAutoRcc a free function 2019-09-29 00:07:32 +02:00
Sebastian Holtermann
820962edc9 Autogen: Refactor json info file reading interface 2019-09-29 00:07:32 +02:00
Cristian Adam
dd0f304613 Objective C/C++: Add compiler standard detection 2019-09-28 15:56:53 +02:00
Cristian Adam
b515af782b Help: Add release note for Objective-C/C++ language support 2019-09-28 15:56:53 +02:00