mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-23 22:58:37 -05:00
Code Issues Packages Projects Releases Wiki Activity
49,204 Commits 2 Branches 401 Tags
369ba2f4e2a3f37c2bb29b768933e8c7d68d815f
Commit Graph

4506 Commits

Author SHA1 Message Date
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
Joachim Wuttke (h) 448e2d7a9d Help: Provide cross-references between compiler settings 2020-05-14 22:17:10 +02:00
Joachim Wuttke (h) 1f697b3991 Help: COMPILE_OPTIONS: bundle cross refs, add example 2020-05-14 22:05:30 +02:00
Alexandru Croitor 3d4b70ea64 set_source_files_properties: Allow specification of directory scope 
Both set_source_files_properties() and set_property(SOURCE) now accept
two new optional arguments: DIRECTORY and TARGET_DIRECTORY.

The DIRECTORY option takes a list of relative or absolute paths
pointing to processed source directories (add_subdirectory was
already called on them).

These paths specify directory scopes where the source file properties
will be set. Previously the scope was always the currently processed
source directory.

Similarly TARGET_DIRECTORY takes a list of targets, whose source
directories will be used as the list of scopes where to set the
source file properties.

get_property() and get_source_file_property() also get the same
new arguments, except only one value can be specified instead
of a list.

Fixes: #20128
 2020-05-14 16:31:22 +02:00
Brad King b1a3131cc6 Merge branch 'backport-3.16-objc-env-vars' into release-3.16 2020-05-14 07:31:32 -04:00
Brad King 13ea190725 Help: Add 3.17.3 release note for Objective C/C++ compiler selection 
Port the 3.16.7 release note for 3.17.3 too.
 2020-05-14 07:28:46 -04:00
Brad King 16bf978e0c Merge branch 'backport-3.16-objc-env-vars' into objc-env-vars 2020-05-14 07:27:24 -04:00
Brad King 67b9f55d46 Objective C/C++: Honor CC and CXX env vars to select compiler 
If the `OBJC` or `OBJCXX` environment variable is not set to specify an
Objective C or C++ compiler, check `CC` or `CXX` too.

Fixes: #20703
 2020-05-14 07:17:48 -04:00
Brad King ab9be6662f Help: Document OBJC and OBJCXX env vars for Objective C/C++ compilers 2020-05-14 07:10:06 -04:00
Brad King 7c4f609eed Merge topic 'FindPython-IronPython-support' 
e8ffc60220 FindPython: Add IronPython support on all platforms

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4730
 2020-05-13 07:41:45 -04:00
Robert Maynard caf5d3f71b Help: Add an example for each UNITY_BUILD_MODE setting 2020-05-11 12:20:01 -04:00
Brad King d4b1d3d4f0 Merge topic 'source_group_forward_slashes' 
faf44a8cdb source_group: Support forward slashes in group hierarchy

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4727
 2020-05-11 10:14:24 -04:00
Brad King cee7eb8b3a Merge topic 'unity_explicit_groups' 
9f4eb352fe Unity Builds: Support explicit specification of sources to groups
b00585adcc Unity: Refactor implementation to make it easier to extend

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4716
 2020-05-11 10:08:12 -04:00
Marc Chevrier e8ffc60220 FindPython: Add IronPython support on all platforms 2020-05-11 14:02:59 +02:00
Craig Scott faf44a8cdb source_group: Support forward slashes in group hierarchy 
Fixes: #18076
 2020-05-11 08:15:25 +10:00
Craig Scott 8afac758e6 Merge topic 'doc-option-existing-var' 
36a6d91011 Help: If a cache variable exists, option() also does nothing

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4721
 2020-05-10 02:34:25 -04:00
Brad King fe82e1b45f Merge topic 'install-rpath-escape-doc' 
495951ea68 Help: Mention CMP0095 in INSTALL_RPATH documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4720
 2020-05-08 08:19:10 -04:00
Brad King 171bf5fa92 Merge topic 'third-parties-layout' 
2faa3f6c55 Refactoring: Third-parties public headers are under cm3p prefix
75e87e3db4 bootstrap: update list of problematic files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4705
 2020-05-08 08:18:17 -04:00
Hong Xu 36a6d91011 Help: If a cache variable exists, option() also does nothing 
The previous text sounded as if option() does some work when a
cache variable exists.
 2020-05-08 18:30:27 +10:00
Ben Boeckel e4f398e0af Help: add alt text to embedded images 2020-05-07 13:25:57 -04:00
Kyle Edwards 495951ea68 Help: Mention CMP0095 in INSTALL_RPATH documentation 2020-05-07 11:58:46 -04:00
Robert Maynard 9f4eb352fe Unity Builds: Support explicit specification of sources to groups 
Instead of having CMake determine which files should go into each
unity file, the user can now use explicitly state the mapping.
 2020-05-07 11:13:34 -04:00
Craig Scott b743ffbfa2 Merge topic 'script-mode-and-arbitrary-args' 
e4f1b301fe cmake: Allow arbitrary args passed to CMake script

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4707
 2020-05-07 09:09:52 -04:00
Marc Chevrier 2faa3f6c55 Refactoring: Third-parties public headers are under cm3p prefix 
Fixes: #20666
 2020-05-07 12:06:08 +02:00
Brad King 502e562940 Merge branch 'backport-3.17-FindPkgConfig-isystem' into FindPkgConfig-isystem 2020-05-06 07:48:23 -04:00