mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 21:31:08 -06:00
Code Issues Packages Projects Releases Wiki Activity
48,746 Commits 2 Branches 385 Tags
d5b5c192780dbbf80ff7e049997c0eaeeebdeb95
Commit Graph

4430 Commits

Author SHA1 Message Date
Marc Chevrier
254f2b9058 Help: add_executable: Add TOC 2020-06-02 15:37:21 +02:00
Brad King
ec7b5f21ee Merge topic 'doc-c-standard' 
e8958d4742 Help: Clarify that no version of MSVC today support C standard levels

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4830
 2020-06-02 08:01:40 -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
Hong Xu
e8958d4742 Help: Clarify that no version of MSVC today support C standard levels 
The current description sounds as if MSVC later than 2015 update 3
support C standard level, which is not true. This patch clarifies MSVC
support.
 2020-06-01 10:51:34 -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
Craig Scott
8aa4d51ec5 ExternalProject: Add missing release note for git update strategy 
This release note was mistakenly omitted from commit 0aea435aa1
(ExternalProject: Provide choice of git update strategies, 2020-02-12).
 2020-05-29 12:10:33 -04:00
Marc Chevrier
1eca5993e2 ALIAS target: cannot overwrite an existing target 
Fixes: #19616
 2020-05-28 12:56:59 -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
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
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
Brad King
3a1853b9fd Merge topic 'doc-updates' 
b3e4fb5144 Help: clarify add_definitions() and add_compile_definitions() behavior

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4786
 2020-05-25 15:50:18 -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
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
Marc Chevrier
b3e4fb5144 Help: clarify add_definitions() and add_compile_definitions() behavior 
Fixes: #20736
 2020-05-24 12:47:24 +02:00
Craig Scott
00c0c27303 Help: Clarify how env vars and ..._INIT variables interact 
Fixes: #20358
 2020-05-24 19:10:14 +10: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
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
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
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
b0a6161190 Fortran: Add Fortran_PREPROCESS property 
Issue: #18870
 2020-05-21 11:44:14 -04:00
Robert Maynard
50879ce412 Conda: Add CONDA_PREFIX as an acceptable system prefix path 2020-05-21 11:32:36 -04:00
Robert Maynard
e55b21e24e CUDA: Compute CMAKE_CUDA_RUNTIME_LIBRARY default from toolchain 
Since commit 0d0145138f (CUDA: Add abstraction for cuda runtime
selection, 2019-11-29, v3.17.0-rc1~83^2) we add CUDA runtime library
selection flags by default.

To maintain backwards compatibility the default CUDA runtime
library needs to be computed based on what libraries are found
on the initial compiler invocation. For example a toolchain
could establish initial flags that have all CUDA compilations
using the runtime version, and if we don't detect this we will
try to link to both the static and shared runtime.

Co-Author: Brad King <brad.king@kitware.com>
Fixes: #20708
 2020-05-21 11:15:03 -04:00
Robert Maynard
1086e930dc CUDA: Propagate CMAKE_CUDA_RUNTIME_LIBRARY state to try_compile 2020-05-20 14:36:55 -04:00
Robert Maynard
a4ea293153 Help: Correct CMAKE_CUDA_RUNTIME_LIBRARY applicability 2020-05-20 14:36:55 -04:00
Brad King
b2a0e8c8b2 Merge topic 'doc-find_package-xref' 
bc735062df Help: Improve formatting and cross-references for find_package()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Brad King <brad.king@kitware.com>
Merge-request: !4772
 2020-05-20 09:13:32 -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
Craig Scott
bc735062df Help: Improve formatting and cross-references for find_package() 2020-05-20 20:54:55 +10:00
Craig Scott
ddcc5a350c Merge topic 'doc-CMAKE_SYSTEM_PREFIX_PATH' 
6b3d8f281e Document which environment variables effect CMAKE_SYSTEM_PREFIX_PATH

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4748
 2020-05-20 06:28:11 -04:00
Cristian Adam
f6cb1e646c Multi-Ninja: Fix PCHs for Visual C++ 
Fixes: #20711
 2020-05-20 11:20:38 +02:00
Robert Maynard
6b3d8f281e Document which environment variables effect CMAKE_SYSTEM_PREFIX_PATH 2020-05-19 10:57:09 -04:00
Kyle Edwards
a1612af749 CTest: Log environment variables as a test measurement 2020-05-19 10:26:57 -04:00
Brad King
80e93984c7 Merge topic 'add_test-special-chars-in-name' 
f84af8e270 add_test: Allow special characters in test name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4754
 2020-05-19 09:48:38 -04:00
Brad King
d7e82a11d5 Merge topic 'fetchcontent-SOURCE_SUBDIR' 
592085b94b FetchContent: Add support for SOURCE_SUBDIR

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4757
 2020-05-18 12:31:54 -04:00
Brad King
b246dee7db Merge topic 'cuda-clang' 
a653ca9504 Tests: Update CUDA tests to work with Clang
5df21adf46 CUDA: Add support for Clang compiler
dc2eae1f91 FindCUDAToolkit: Factor out discovery code into a separate file
70be10cbf4 CUDA: Remove toolkit include dirs from implicit include dirs only with NVIDIA

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Artem Belevich <tra@google.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Acked-by: Axel Huebl <axel.huebl@plasma.ninja>
Acked-by: friendnick <ikoval67@gmail.com>
Acked-by: Patrik Huber <patrikhuber@gmail.com>
Merge-request: !4442
 2020-05-18 12:29:44 -04:00
Brad King
4acf31d681 Merge topic 'compile_opts' 
448e2d7a9d Help: Provide cross-references between compiler settings
1f697b3991 Help: COMPILE_OPTIONS: bundle cross refs, add example

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4749
 2020-05-18 12:27:31 -04:00
Deniz Bahadir
f84af8e270 add_test: Allow special characters in test name 
Fixes: #19391
 2020-05-17 10:53:14 +02:00
Craig Scott
592085b94b FetchContent: Add support for SOURCE_SUBDIR 
Fixes: #19875
 2020-05-16 17:01:10 +10:00
Raul Tambre
5df21adf46 CUDA: Add support for Clang compiler 
When crosscompiling we pass the sysroot.

We need to try various architecture flags. Clang doesn't automatically
select one that works.  First try the ones that are more likely to work
for modern installations:

* <=sm_50 is deprecated since CUDA 10.2, try sm_52 first for
          future compatibility.
* <=sm_20 is removed since CUDA 9.0, try sm_30.

Otherwise fallback to Clang's current default. Currently that's `sm_20`,
the lowest it supports.

Separable compilation isn't supported yet.

Fixes: #16586
 2020-05-15 17:46:51 +03:00
Brad King
4d85ad8c98 Merge topic 'backport-3.16-FindPkgConfig-isystem' into release-3.17 
3719ddd3f3 Help: Add 3.16.7 release note for FindPkgConfig '-isystem' fix

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4752
 2020-05-15 10:32:49 -04:00
Brad King
ffd41f81c2 Merge topic 'backport-3.16-FindPkgConfig-isystem' 
3719ddd3f3 Help: Add 3.16.7 release note for FindPkgConfig '-isystem' fix

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4752
 2020-05-15 10:32:49 -04:00
Brad King
eb93b50be9 Merge topic 'source_file_scopes' 
3d4b70ea64 set_source_files_properties: Allow specification of directory scope

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4661
 2020-05-15 09:58:03 -04:00
Brad King
3719ddd3f3 Help: Add 3.16.7 release note for FindPkgConfig '-isystem' fix 
Add a release note for the change in commit 4d446c68d1 (FindPkgConfig:
also handle "-isystem" prefixes for include directories, 2020-04-30).
 2020-05-15 09:46:06 -04:00
Brad King
a9559ccba5 Merge topic 'objc-env-vars' 
13ea190725 Help: Add 3.17.3 release note for Objective C/C++ compiler selection
16bf978e0c Merge branch 'backport-3.16-objc-env-vars' into objc-env-vars
67b9f55d46 Objective C/C++: Honor CC and CXX env vars to select compiler
ab9be6662f Help: Document OBJC and OBJCXX env vars for Objective C/C++ compilers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4746
 2020-05-15 09:15:46 -04:00