mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-24 17:18:37 -05:00
Code Issues Packages Projects Releases Wiki Activity
48,286 Commits 2 Branches 403 Tags
3ed8b663a9fd6e8d6f7ec0571ab1e3530f9156db
Commit Graph

48286 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King 3ed8b663a9 Merge topic 'gitlab-ci-regular-builders' 
b566f0b308 gitlab-ci: add windows builder
5b564c371e gitlab-ci: add Windows infrastructure
809f9a9916 gitlab: add powershell scripts for utilities
02c56b71a1 gitlab-ci: add a macos builder
a1b1fc611b gitlab-ci: add Linux makefiles and ninja builders
3e1a1ba92d ci: add dependencies for the test suite to the Fedora image
d5438f783a ci: add make to the CI image
0ed7e424ab gitlab-ci: use the cmake_build_unix anchor
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4723
 2020-05-25 11:10:06 -04:00
Brad King a354b7f21e Merge topic 'CheckLinkerFlag-module' 
af96c0f4fa CheckLinkerFlag: Add module to check validity of linker flags
3c4cc77d55 Tests: Extend Fortran compiler information

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4777
 2020-05-25 10:59:01 -04:00
Marc Chevrier af96c0f4fa CheckLinkerFlag: Add module to check validity of linker flags 
Fixes: #15934
 2020-05-25 10:57:14 -04:00
Marc Chevrier 3c4cc77d55 Tests: Extend Fortran compiler information 
Fill variable `CMake_Fortran_COMPILER_ID`.
 2020-05-25 10:57:06 -04:00
Brad King b82bdbf44a Merge topic 'ep-git-update-strategy' 
0aea435aa1 ExternalProject: Provide choice of git update strategies
ea410414c5 ExternalProject: factor out gitupdate step to separate file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4239
 2020-05-25 10:53:26 -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 54baf63965 Merge topic 'FindSquish_settingsgroup_removal' 
8492ac1363 FindSquish: Remove settingsGroup argument

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4763
 2020-05-25 10:37:11 -04:00
Brad King 5b2e68acb6 Merge topic 'curl-send-recv' 
0a46eb11af curl: Avoid checking 'send' and 'recv' signatures

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !4767
 2020-05-25 10:36:12 -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 7b56d0a377 Merge branch 'release-3.17' 2020-05-25 10:33:27 -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
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
Kitware Robot 7612246d0f CMake Nightly Date Stamp 2020-05-25 00:01:17 -04:00
Craig Scott 946accf5ce Merge topic 'doc-init-and-env-var-priority' 
00c0c27303 Help: Clarify how env vars and ..._INIT variables interact

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4782
 2020-05-24 18:03:01 -04:00
Craig Scott 00c0c27303 Help: Clarify how env vars and ..._INIT variables interact 
Fixes: #20358
 2020-05-24 19:10:14 +10:00
Kitware Robot 2770d5c202 CMake Nightly Date Stamp 2020-05-24 00:01:12 -04:00
Craig Scott 886a5e3af6 Merge topic 'doc-contributing-forum' 
4f7cdcaabf Help: Update contributor instructions to refer to the forum

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4785
 2020-05-23 19:23:00 -04:00
Craig Scott 4f7cdcaabf Help: Update contributor instructions to refer to the forum 
Fixes: #20746
 2020-05-24 09:13:48 +10:00
Craig Scott 0aea435aa1 ExternalProject: Provide choice of git update strategies 
Fixes: #16528

Co-Authored-By: Michael Wake <macwake@gmail.com>
 2020-05-23 22:27:38 +10:00
Kitware Robot eac593ea9f CMake Nightly Date Stamp 2020-05-23 00:01:37 -04:00
Craig Scott ea410414c5 ExternalProject: factor out gitupdate step to separate file 
The refactoring exposed that the original implementation
was referring to an undefined variable src_name, which was
previously only used in error messages. This has been fixed
as part of the refactoring work.

Fixes: #20336
 2020-05-23 11:01:59 +10: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
Ben Boeckel b566f0b308 gitlab-ci: add windows builder 2020-05-22 11:34:14 -04:00
Ben Boeckel 5b564c371e gitlab-ci: add Windows infrastructure 2020-05-22 11:34:14 -04:00
Ben Boeckel 809f9a9916 gitlab: add powershell scripts for utilities 2020-05-22 11:34:14 -04:00
Ben Boeckel 02c56b71a1 gitlab-ci: add a macos builder 2020-05-22 11:34:14 -04:00
Ben Boeckel a1b1fc611b gitlab-ci: add Linux makefiles and ninja builders 2020-05-22 11:34:14 -04:00
Ben Boeckel 3e1a1ba92d ci: add dependencies for the test suite to the Fedora image 2020-05-22 11:34:14 -04:00
Ben Boeckel d5438f783a ci: add make to the CI image 2020-05-22 11:34:14 -04:00
Ben Boeckel 0ed7e424ab gitlab-ci: use the cmake_build_unix anchor 2020-05-22 11:34:14 -04:00
Ben Boeckel d89d333070 CTestCustom: ignore expat having symbol-less objects too 2020-05-22 11:34:14 -04:00
Ben Boeckel 165e56950a Tests/CPackWiXGenerator: support suppressing verification 
Verification requires access to an active Windows session which may not
be the case in all testing environments.
 2020-05-22 11:34:14 -04:00
Ben Boeckel 28f2ad9419 Tests/CPackWiXGenerator; support non-interactive sessions 2020-05-22 11:34:14 -04:00
Ben Boeckel 9d5e32b79b Tests/RunCMake/export: handle collapsed newlines 
When the build path is long with a space near the line length, a newline
is lost.
 2020-05-22 11:34:14 -04:00
Justin Goshi 9f6d40ee23 fileapi: Extend codemodel targets with PRECOMPILE_HEADERS 2020-05-22 11:26:55 -04:00
Justin Goshi b698764a31 Tests: Add a PCH example to RunCMake.FileAPI codemodel-v2 2020-05-22 11:23:33 -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 b3812c0e54 Tests: Fix indentation in RunCMake.FileAPI cxx_exe.json 2020-05-22 10:07:30 -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 bcb44ac2ee CUDA: Simplify Clang implicit host linker settings 
The purpose of `CMAKE_CUDA_HOST_IMPLICIT_LINK_*` is to capture the
extra link libraries and directories that the CUDA compiler passes
when invoking the host linker.  We need this when using NVCC because
CMake drives the host linker directly rather than through NVCC.
However, this is not needed with Clang because:

* Clang does not pass any CUDA libraries automatically.
* We drive linking with the Clang compiler anyway.

Drop the detection logic for Clang because it only gives the normal C++
runtime libraries which we do not need here.
 2020-05-22 08:15:38 -04:00
Brad King 23519dd24f CUDA: Fix implicit runtime library filtering on Windows 
The CUDA runtime library names may have a `.lib` suffix.
Exclude those too.
 2020-05-22 08:15:38 -04:00
Brad King 16bed00712 CUDA: Refactor implicit library filtering 
Filter CMAKE_CUDA_HOST_IMPLICIT_LINK_LIBRARIES just after it is
computed.  Re-use the same exclusion list for filtering
CMAKE_CUDA_IMPLICIT_LINK_LIBRARIES to avoid duplication.
 2020-05-22 08:15:38 -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 a7b3102e00 Merge topic 'support_conda_env' 
50879ce412 Conda: Add CONDA_PREFIX as an acceptable system prefix path
cd9c3c000f Tests: Update QtAutogen codeeditor test only include headers needed
d806bd2e8c Tests: Update test suite to run in an Anaconda environment

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4773
 2020-05-22 08:12:24 -04:00
Brad King 0781540a80 Merge topic 'cuda-default-runtime' into release-3.17 
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 fa6db3738a Merge branch 'release-3.17' 2020-05-22 06:55:37 -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