mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-23 06:47:08 -05:00
Code Issues Packages Projects Releases Wiki Activity
48,722 Commits 2 Branches 401 Tags
21bebd2d4bc3e4c8f6003d1ebef785df7cef00fc
Commit Graph

29033 Commits

Author SHA1 Message Date
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
Brad King f7960e5488 Merge topic 'cuda-runtime-cleanup' 
bcb44ac2ee CUDA: Simplify Clang implicit host linker settings
23519dd24f CUDA: Fix implicit runtime library filtering on Windows
16bed00712 CUDA: Refactor implicit library filtering
5c7ca6f8a8 CUDA: Move VS CudaRuntime selection to be with rest of CUDA options
4468acb979 CUDA: Factor runtime library lookup into helper method

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !4776
 2020-05-25 10:35:13 -04:00
Brad King f0ff991e42 Merge topic 'ninja-multi-install' into release-3.17 
dddb4f02f7 Ninja Multi-Config: Make "install" targets depend on default configs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4778
 2020-05-25 10:33:26 -04:00
Brad King 99ab9212f0 Merge topic 'ninja-multi-install' 
dddb4f02f7 Ninja Multi-Config: Make "install" targets depend on default configs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4778
 2020-05-25 10:33:26 -04:00
Kitware Robot 7612246d0f CMake Nightly Date Stamp 2020-05-25 00:01:17 -04:00
Kitware Robot 2770d5c202 CMake Nightly Date Stamp 2020-05-24 00:01:12 -04:00
Kitware Robot eac593ea9f CMake Nightly Date Stamp 2020-05-23 00:01:37 -04:00
Kyle Edwards dddb4f02f7 Ninja Multi-Config: Make "install" targets depend on default configs 
And add an "install:all" target.

Fixes: #20713
 2020-05-22 13:15:50 -04:00
Justin Goshi 9f6d40ee23 fileapi: Extend codemodel targets with PRECOMPILE_HEADERS 2020-05-22 11:26:55 -04:00
Brad King 62816ff88c Merge topic 'fortran-preprocess-property' 
3888de23da Ninja: Skip Fortran preprocessing if Fortran_PREPROCESS is OFF
66c4e87282 Ninja: Add helper functions to generate Fortran build
5cca1ec893 Ninja: Add helper functions to generate Fortran preprocess rule
b0a6161190 Fortran: Add Fortran_PREPROCESS property

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4659
 2020-05-22 10:35:10 -04:00
Craig Scott 1b0049680b Merge topic 'cmake_language-rename-from-cmake_command' 
94c1e4fdb3 cmake_language: Rename command from cmake_command

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4774
 2020-05-22 10:25:29 -04:00
Brad King 9c48804b69 PCH: Fix source group of per-architecture PCH headers 
In commit f593b354da (PCH: Add support for multi architecture iOS
projects, 2020-04-02) we forgot to update our regex that assigns
PCH headers to the `Precompile Header File` source group to account
for the `_<arch>` suffix that can now appear on their name.
 2020-05-22 10:06:05 -04:00
Brad King 5c7ca6f8a8 CUDA: Move VS CudaRuntime selection to be with rest of CUDA options 2020-05-22 08:15:37 -04:00
Brad King 4468acb979 CUDA: Factor runtime library lookup into helper method 2020-05-22 08:15:32 -04:00
Brad King 9c70475755 Merge topic 'autogen-fix-workerpool-locking' 
01ad902588 Autogen: Redo locking and state machine for fence handling and the worker pool

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4775
 2020-05-22 08:13:53 -04:00
Brad King b54280beb7 Merge topic 'cuda-default-runtime' 
d8eee80e30 Merge branch 'backport-cuda-default-runtime' into cuda-default-runtime
e55b21e24e CUDA: Compute CMAKE_CUDA_RUNTIME_LIBRARY default from toolchain
1086e930dc CUDA: Propagate CMAKE_CUDA_RUNTIME_LIBRARY state to try_compile
a4ea293153 Help: Correct CMAKE_CUDA_RUNTIME_LIBRARY applicability

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4762
 2020-05-22 06:55:37 -04:00
Brad King d8eee80e30 Merge branch 'backport-cuda-default-runtime' into cuda-default-runtime 2020-05-22 06:50:19 -04:00
Kitware Robot 23acffe5dd CMake Nightly Date Stamp 2020-05-22 00:01:13 -04:00
Joerg Sonnenberger 01ad902588 Autogen: Redo locking and state machine for fence handling and the worker pool 
(1) All CV use must hold the corresponding mutex, otherwise race
conditions happen. This is mandated by the C++ standard.

(2) Introduce a separate CV for the thread waiting for other jobs to
finish before running a fence. This avoids waking up all other workers
blindly. Correctly wake that thread up when the processing of outstanding
jobs is done.

(3) Split the waiting for a fence to become runnable from a fence is
pending. This avoids problems if more than one fence can end up on the
queue. The thread that took a fence off the queue is responsible for
clearing the fence processing flag.
 2020-05-21 16:17:36 -04:00
Brad King 94c1e4fdb3 cmake_language: Rename command from cmake_command 
Also rename the `INVOKE` signature to `CALL`.

Fixes: #20732
 2020-05-21 13:36:52 -04:00
Brad King 9ec09f22ff Merge topic 'multi-ninja-pch-msvc' 
f6cb1e646c Multi-Ninja: Fix PCHs for Visual C++

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4771
 2020-05-21 11:52:12 -04:00
Peter Hill 3888de23da Ninja: Skip Fortran preprocessing if Fortran_PREPROCESS is OFF 
If `Fortran_PREPROCESS` is explicitly turned off for a source file then
we know it does not need to be preprocessed.  Teach the Ninja generator
to skip preprocessing in this case.  Otherwise we still must preprocess
just in case.

Fixes: #18870
 2020-05-21 11:46:32 -04:00
Peter Hill 66c4e87282 Ninja: Add helper functions to generate Fortran build 2020-05-21 11:45:58 -04:00
Peter Hill 5cca1ec893 Ninja: Add helper functions to generate Fortran preprocess rule 2020-05-21 11:45:58 -04:00
Peter Hill b0a6161190 Fortran: Add Fortran_PREPROCESS property 
Issue: #18870
 2020-05-21 11:44:14 -04:00
Brad King 3c5d52579b Merge topic 'cmake_command_invoke_expand_function_name' 
aa55587094 cmake_command: Expand INVOKE function name argument

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4750
 2020-05-21 11:38:32 -04:00
Kitware Robot 8351a349f7 CMake Nightly Date Stamp 2020-05-21 00:01:14 -04:00
Robert Maynard 1086e930dc CUDA: Propagate CMAKE_CUDA_RUNTIME_LIBRARY state to try_compile 2020-05-20 14:36:55 -04:00
Brad King f60ca6b464 Merge topic 'ccmake-check-width' 
3aede31cfc ccmake: Check that getmaxyx result width is non-negative

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4770
 2020-05-20 09:12:22 -04:00
Brad King 00d6e41a07 Merge topic 'ctest-log-environment' 
a1612af749 CTest: Log environment variables as a test measurement

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4760
 2020-05-20 09:11:03 -04:00
Brad King e4b095268b Merge topic 'update-kwsys' 
ef215b0851 cmFileCommand: Log cmsys::Glob warnings
ef4d992b54 Merge branch 'upstream-KWSys' into update-kwsys
8fd4c19e1b KWSys 2020-05-18 (146f6b36)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4758
 2020-05-20 09:07:50 -04:00