Commit Graph

28963 Commits

Author SHA1 Message Date
Kitware Robot 81c8fc9023 CMake Nightly Date Stamp 2020-06-03 00:01:18 -04:00
Brad King 961ca77a7a Merge topic 'gitlab-ci-ninja-multi'
e1b2c0108f gitlab-ci: add a Ninja Multi-Config test job
1e8ecfccdd gitlab-ci: also build ncurses and Qt code on Linux
95721f0a82 ci: install ncurses and Qt development into the Fedora 31 image
ed2fe558b0 CursesDialog: resolve clang-tidy warnings
44f1744bed QtDialog: avoid using deprecated APIs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4832
2020-06-02 09:17:24 -04:00
Brad King a432b1075c Merge topic 'getdef-expand'
7ed8c9ebe3 cmMakefile: add GetDefExpandList() that splits value into std::vector

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4819
2020-06-02 08:02:24 -04:00
Brad King fff14290d2 Merge topic 'cmprop'
b36d1bdd9d Single location for cmProp typedef

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4829
2020-06-02 08:00:55 -04:00
Brad King 855a7158ed Merge topic 'target_link_libraries-self-link-is-an-error'
9436ad35df target_link_libraries: self-link through ALIAS is an error

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4826
2020-06-02 07:53:40 -04:00
Brad King 1b0b0c6427 Merge topic 'getdef-nodups'
1e805f53f5 GetDefinition: avoid duplicate calls

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4824
2020-06-02 07:52:14 -04:00
Ben Boeckel ed2fe558b0 CursesDialog: resolve clang-tidy warnings
Fixes:

  - unnecessary bool expression (cmCursesMainForm)
  - removes a duplicate if/else branch (RegexExplorer)
  - collapses redundant if/else branch logic (CMakeSetupDialog and
    cmCursesStringWidget)
2020-06-02 07:37:56 -04:00
Ben Boeckel 44f1744bed QtDialog: avoid using deprecated APIs 2020-06-02 07:37:56 -04:00
Kitware Robot 06f9be47b8 CMake Nightly Date Stamp 2020-06-02 00:01:19 -04:00
Vitaly Stakhovsky b36d1bdd9d Single location for cmProp typedef 2020-06-01 08:54:20 -04:00
Brad King e773892ccb Merge topic 'non-coverage-lines'
ed6d20ddcb CTest: Handle non-coverage lines in gcov files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4822
2020-06-01 07:48:25 -04:00
Brad King 3020decbff Merge topic 'pch-fix-bad-ClearSourcesCache'
902858367f Merge branch 'backport-3.16-pch-fix-bad-ClearSourcesCache'
fa7b041eca PCH: Fix logic error that incorrectly clears sources during VS generation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4815
2020-06-01 07:44:35 -04:00
Brad King 8cf2e1de22 Merge topic 'ninja-multi-export-all-symbols'
6fc4bfa11c Ninja Multi-Config: Fix bug in CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alex Reinking <alex_reinking@berkeley.edu>
Merge-request: !4825
2020-06-01 07:36:50 -04:00
Kitware Robot 14e25d991b CMake Nightly Date Stamp 2020-06-01 00:01:14 -04:00
Kitware Robot 6e7230f7dd CMake Nightly Date Stamp 2020-05-31 00:01:13 -04:00
Vitaly Stakhovsky 7ed8c9ebe3 cmMakefile: add GetDefExpandList() that splits value into std::vector
Combines cmMakefile:GetDefinition() and cmExpandList()
2020-05-30 08:59:20 -04:00
Marc Chevrier 9436ad35df target_link_libraries: self-link through ALIAS is an error
Fixes: #19617
2020-05-30 11:47:39 +02:00
Kitware Robot 67dd687657 CMake Nightly Date Stamp 2020-05-30 00:01:21 -04:00
Kyle Edwards 6fc4bfa11c Ninja Multi-Config: Fix bug in CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS
Fixes: #20775
2020-05-29 15:28:43 -04:00
Vitaly Stakhovsky 1e805f53f5 GetDefinition: avoid duplicate calls 2020-05-29 13:12:22 -04:00
Tobias Ellinghaus ed6d20ddcb CTest: Handle non-coverage lines in gcov files
This implements a TODO in gcov file handling.
2020-05-29 16:08:47 +02:00
Brad King 5058fb5401 VS: Drop StdOutEncoding with VS 16.6 pending investigation
The `StdOutEncoding` added to `.vcxproj` files since commit bc877a7e94
(Add support to indicate UTF-8 custom command pipe output encoding,
2020-04-08) breaks custom commands with symbolic outputs on VS 16.6.0.
Disable it pending further investigation and possibly a fix in VS.

Issue: #20769
2020-05-29 08:24:14 -04:00
Brad King 25b63e06a1 Merge topic 'alias-cannot-overwrite-another-target'
1eca5993e2 ALIAS target: cannot overwrite an existing target

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4810
2020-05-29 07:14:25 -04:00
Brad King ce7570e21a Merge topic 'bugfix-gcev'
d606b19f7d server-mode: Fix regression in cache entry reporting

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4808
2020-05-29 07:13:22 -04:00
Brad King 902858367f Merge branch 'backport-3.16-pch-fix-bad-ClearSourcesCache' 2020-05-29 06:14:59 -04:00
Brad King fa7b041eca PCH: Fix logic error that incorrectly clears sources during VS generation
Since commit 729d997f10 (Precompile Headers: Add REUSE_FROM signature,
2019-08-30, v3.16.0-rc1~101^2), `GetPchFileObject` handles the case that
it is called first for another target's `REUSE_FROM` by calling
`AddSource` to make sure `GetObjectName` can produce the correct object
name.  However, `AddSource` causes `ClearSourcesCache` to be called,
which since commit a9f4f58f0c (cmGeneratorTarget: Clear AllConfigSources
in ClearSourcesCache, 2020-05-15, v3.16.7~2^2) now correctly erases the
`AllConfigSources` structure.  This is okay during `AddPchDependencies`,
but there is another code path in which it is problematic.

When the Visual Studio generator's `WriteAllSources` method is looping
over the sources, the `cmake_pch.cxx` source is encountered first.  This
causes `OutputSourceSpecificFlags` to call `GetPchCreateCompileOptions`,
which calls `GetPchFile`, which under MSVC with `CMAKE_LINK_PCH` calls
`GetPchFileObject`.  That leads to `ClearSourcesCache` erasing the
structure over which `WriteAllSources` is iterating!

This bug is caught by our `RunCMake.PrecompileHeaders` test when run
with the VS generator as of the commit that exposed it by fixing
`ClearSourcesCache`.  However, that change was backported to the CMake
3.16 series after testing only with later versions versions that contain
commit a55df20499 (Multi-Ninja: Add precompile headers support,
2020-01-10, v3.17.0-rc1~136^2).  By adding proper multi-config support
for PCH, that commit taught `cmLocalGenerator::AddPchDependencies` to
call `GetPchFile` with the real set of configurations instead of just
the empty string.  This allows the `GetPchFile` cache of PCH sources to
be populated up front so that the later calls to it in the
`WriteAllSources` loop as described above do not actually call
`GetPchFileObject` or `ClearSourcesCache`.  That hid the problem.

Fix this by re-ordering calls to `AddPchDependencies` to handle
`REUSE_FROM` targets only after the targets whose PCH they re-use.
Remove the now-unnecessary call to `AddSource` from `GetPchFileObject`
so that `ClearSourcesCache` is never called during `WriteAllSources`.
Update the PchReuseFrom test case to cover an ordering of targets that
causes generators to encounter a `REUSE_FROM` target before the target
whose PCH it re-uses.

Fixes: #20770
2020-05-29 05:52:03 -04:00
Kitware Robot da87557024 CMake Nightly Date Stamp 2020-05-29 00:01:19 -04:00
Marc Chevrier 1eca5993e2 ALIAS target: cannot overwrite an existing target
Fixes: #19616
2020-05-28 12:56:59 -04:00
Brad King e647949539 CMake 3.17.3 2020-05-28 06:57:26 -04:00
Brad King 5fa7276489 Merge topic 'update-kwsys'
9c161cc2d0 Merge branch 'upstream-KWSys' into update-kwsys
c47501bcca KWSys 2020-05-27 (a3263389)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4804
2020-05-28 06:54:50 -04:00
Brad King 262ecc99d0 Merge topic 'multi-ninja-pch-object-library'
1f791eb160 Multi-Ninja: Fix reusable PCHs for MSVC

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alexej Harm <alexej.h@xiphos.de>
Merge-request: !4787
2020-05-28 06:53:59 -04:00
Vitaly Stakhovsky d606b19f7d server-mode: Fix regression in cache entry reporting
Refactoring in commit 0bf0e35e59 (cmCacheManager::GetProperty: return
cmProp, 2020-03-19) changed the return type of GetCacheEntryValue.
Update the server mode's call site accordingly.
2020-05-28 06:46:10 -04:00
Kitware Robot 2d90ec54a0 CMake Nightly Date Stamp 2020-05-28 00:01:15 -04:00
Cristian Adam 1f791eb160 Multi-Ninja: Fix reusable PCHs for MSVC
Fixes: #20721
2020-05-27 14:19:03 -04:00
Brad King 9c161cc2d0 Merge branch 'upstream-KWSys' into update-kwsys
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2020-05-27 (a3263389)
2020-05-27 08:33:39 -04:00
Brad King 340dcadb8b Merge topic 'update-gitlab-links'
eb705b9531 Update links to gitlab.kitware.com repos to add `-/`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !4795
2020-05-27 08:21:20 -04:00
Brad King 6bfc6f6abc Merge topic 'cmState-unused-method'
0b837ab371 cmState: Drop unused and unimplemented SetCacheValue method

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4797
2020-05-27 08:20:20 -04:00
Brad King 1174f45990 Merge topic 'automoc-after-generated-sources'
8f2702005a AutoMoc: Configure AutoMoc after generated sources (PCH, Unity)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4792
2020-05-27 08:19:31 -04:00
Brad King 3a9b257ee7 Merge topic 'cmake_language-check-invalid-commands'
12e483c563 cmake_language: check CALL with control command

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4788
2020-05-27 08:17:49 -04:00
Brad King 6fce0cbcab Merge topic 'ctest-repeat-notrun' into release-3.17
bbb62dcc72 CTest: Make sure NOT_RUN tests show up in the failed test log
c503251997 Tests: Add coverage of ctest_test RETURN_VALUE and REPEAT

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4801
2020-05-27 08:14:21 -04:00
Brad King 6fac882730 Merge topic 'ctest-repeat-notrun'
0a74d7c2b8 Merge branch 'backport-ctest-repeat-notrun' into ctest-repeat-notrun
bbb62dcc72 CTest: Make sure NOT_RUN tests show up in the failed test log
c503251997 Tests: Add coverage of ctest_test RETURN_VALUE and REPEAT

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4801
2020-05-27 08:14:21 -04:00
Brad King 0a74d7c2b8 Merge branch 'backport-ctest-repeat-notrun' into ctest-repeat-notrun 2020-05-27 06:45:39 -04:00
Robert Maynard bbb62dcc72 CTest: Make sure NOT_RUN tests show up in the failed test log
Issue: #20543
2020-05-27 06:43:01 -04:00
Kitware Robot d08232f87a CMake Nightly Date Stamp 2020-05-27 00:01:14 -04:00
Brad King 0b837ab371 cmState: Drop unused and unimplemented SetCacheValue method
Fixes: #20758
2020-05-26 12:54:49 -04:00
Brad King eb705b9531 Update links to gitlab.kitware.com repos to add -/
GitLab now uses a `/-/` component between the `group/project` part of
the URL and the `{issues,merge_requests,tree}` part so that it can
support `group/subgroup/project` with arbitrary depth.
2020-05-26 11:38:01 -04:00
Marc Chevrier 12e483c563 cmake_language: check CALL with control command
Fixes: #20739
2020-05-26 07:27:35 -04:00
Cristian Adam 8f2702005a AutoMoc: Configure AutoMoc after generated sources (PCH, Unity)
Fixes: #20119
2020-05-26 13:14:27 +02:00
Kitware Robot b8a6300e6e CMake Nightly Date Stamp 2020-05-26 00:01:19 -04:00
Brad King 15b9b41d72 Merge topic 'fileApiAddPrecompileHeadersBacktrace'
9f6d40ee23 fileapi: Extend codemodel targets with PRECOMPILE_HEADERS
b698764a31 Tests: Add a PCH example to RunCMake.FileAPI codemodel-v2
b3812c0e54 Tests: Fix indentation in RunCMake.FileAPI cxx_exe.json
9c48804b69 PCH: Fix source group of per-architecture PCH headers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4684
2020-05-25 10:40:56 -04:00