mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-26 10:48:38 -06:00
Code Issues Packages Projects Releases Wiki Activity
48,190 Commits 2 Branches 391 Tags
bc735062df1bf152e3c80c0928eada6d224132b5
Commit Graph

48190 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Kitware Robot
c8fdc54a3b CMake Nightly Date Stamp 2020-05-20 00:01:14 -04:00
Robert Maynard
6b3d8f281e Document which environment variables effect CMAKE_SYSTEM_PREFIX_PATH 2020-05-19 10:57:09 -04:00
Brad King
2f3a356ea8 Merge topic 'src-named-for-config' 
70c85c1d6f Tests: Add case for source files named with CONFIG genex
3b547e2e4b VS: Simplify logic adding source file C/C++ language flag to MSVC
27ead9d4b7 VS: Compute managed type from an existing configuration
1222327c89 VS: Write custom commands for sources from all configurations
65fe58a4b4 cmVisualStudio10TargetGenerator: Adopt Windows Store and Phone infrastructure
3fa3b7a402 cmGeneratorTarget: Remove default config from Get* methods
d6a88d2158 cmTarget: Replace "perConfig" constructor boolean with enum

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4761
 2020-05-19 09:56:48 -04:00
Brad King
e14894c4f7 Merge topic 'simplify_cmPropertyDefinitionMap' 
6728f0fa85 cmPropertyDefinitionMap: simplify and shorten

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4753
 2020-05-19 09:54:39 -04:00
Brad King
2fe2d47b33 Merge topic 'FindHDF5-cleanup' 
8fa58aea77 FindHDF5: Clean variables and output

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4759
 2020-05-19 09:52:22 -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
Kitware Robot
cc79253fa4 CMake Nightly Date Stamp 2020-05-19 00:01:13 -04:00
Brad King
70c85c1d6f Tests: Add case for source files named with CONFIG genex 
This is now expected to work on all generators where the test runs.
Recent ancestors of this commit fix the Visual Studio generator.

Fixes: #20648
 2020-05-18 15:34:18 -04:00
Brad King
3b547e2e4b VS: Simplify logic adding source file C/C++ language flag to MSVC 
Do not add a target-wide language flag.  We need a flag on an individual
source file to explicitly specify the C or C++ language if and only if
the source file extension does not imply it.
 2020-05-18 15:34:17 -04:00
Brad King
27ead9d4b7 VS: Compute managed type from an existing configuration 
It is not clear how multiple configurations should be handled here, but
using an existing configuration is at least better than the empty
configuration.
 2020-05-18 15:34:15 -04:00
Brad King
1222327c89 VS: Write custom commands for sources from all configurations 2020-05-18 15:33:16 -04:00
Brad King
65fe58a4b4 cmVisualStudio10TargetGenerator: Adopt Windows Store and Phone infrastructure 
Move support for Resx, Xaml, Certificate, and AppManifest file handling
out of cmGeneratorTarget.
 2020-05-18 12:56:56 -04:00
Brad King
3fa3b7a402 cmGeneratorTarget: Remove default config from Get* methods 
Ensure all call sites pass an explicit configuration.
 2020-05-18 12:56:56 -04:00
Brad King
d6a88d2158 cmTarget: Replace "perConfig" constructor boolean with enum 2020-05-18 12:56:55 -04:00
Seth R Johnson
8fa58aea77 FindHDF5: Clean variables and output 
The module's functionality is preserved.  Perform cleanups:

- Format some functions
- Change macros to functions
- Fix return value check from execute_process
- Hide status messages unless HDF5_FIND_DEBUG is enabled
- Normalize TRUE/FALSE capitalization

Fixes: #20718
 2020-05-18 12:40:01 -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
Brad King
9039e1f80d Merge branch 'release-3.16' 2020-05-18 12:26:34 -04:00
Brad King
e7b47589b2 Merge branch 'release-3.17' 2020-05-18 12:23:41 -04:00
Brad King
ab0a092e13 Merge topic 'fix-ClearSourcesCache' 
a9f4f58f0c cmGeneratorTarget: Clear AllConfigSources in ClearSourcesCache

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4751
 2020-05-18 12:23:41 -04:00
Brad King
00949be941 Merge topic 'fix-ClearSourcesCache' into release-3.17 
a9f4f58f0c cmGeneratorTarget: Clear AllConfigSources in ClearSourcesCache

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4751
 2020-05-18 12:23:40 -04:00
Brad King
31252bd335 Merge topic 'FindOpenSSL-applink' 
7b83ca816a FindOpenSSL: add target OpenSSL::applink to support OpenSSL's applink feature

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4737
 2020-05-18 12:22:24 -04:00
Brad King
ca699e9d69 Merge topic 'fix-CheckTargetsForMissingSources' 
25995b2b30 cmGlobalGenerator: Fix CheckTargetsForMissingSources after refactoring

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4747
 2020-05-18 12:20:50 -04:00
Craig Scott
6d9bc2d8cf Merge topic 'find-doxygen-parallel-tests' 
cb8f7e3aad FindDoxygen: Prevent tests from interfering with each other

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4756
 2020-05-18 08:15:54 -04:00
Kitware Robot
6c4bfb6e7f CMake Nightly Date Stamp 2020-05-18 00:01:10 -04:00
Deniz Bahadir
f84af8e270 add_test: Allow special characters in test name 
Fixes: #19391
 2020-05-17 10:53:14 +02:00
Kitware Robot
deffd54250 CMake Nightly Date Stamp 2020-05-17 00:01:11 -04:00
Craig Scott
592085b94b FetchContent: Add support for SOURCE_SUBDIR 
Fixes: #19875
 2020-05-16 17:01:10 +10:00
Kitware Robot
135b5835a4 CMake Nightly Date Stamp 2020-05-16 00:01:17 -04:00
Craig Scott
cb8f7e3aad FindDoxygen: Prevent tests from interfering with each other 
When doing something like ctest -j8, the FindDoxygen.SimpleTest
test case would execute multiple doxygen sub-tests that then try
to create/write to the same output directory.
 2020-05-16 12:20:36 +10:00
Raul Tambre
a653ca9504 Tests: Update CUDA tests to work with Clang 2020-05-15 18:12:39 +03:00
Brad King
ec1b3992db Merge branch 'release-3.16' 2020-05-15 11:10:07 -04: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
Raul Tambre
dc2eae1f91 FindCUDAToolkit: Factor out discovery code into a separate file 
This allows for re-use in other parts of the code, that require the CUDA
toolkit location, but can't or may not want to use the full
`FindCUDAToolkit`.
 2020-05-15 17:46:51 +03:00
Brad King
70be10cbf4 CUDA: Remove toolkit include dirs from implicit include dirs only with NVIDIA 
The special case added by commit 87df637078 (CUDA: Do not treat CUDA
toolkit include directories as implicit, 2020-02-02, v3.17.0-rc1~31^2)
breaks CMake's protections against changing the compiler's implicit
include directory order.  Do this only for the NVIDIA compiler where it
is needed as a workaround to another problem.  That compiler does not
put the host compiler's implicit include directories in `-I` paths so we
do not detect them as `CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES` anyway.
 2020-05-15 17:46:51 +03:00
Brad King
1bdbd4651a Merge branch 'release-3.17' 2020-05-15 10:32:50 -04: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
36599e2a7a Merge branch 'fix-ClearSourcesCache' into release-3.16 
Merge-request: !4751
 2020-05-15 09:53:05 -04:00
Brad King
481100ecbc Merge branch 'backport-3.16-FindPkgConfig-isystem' into release-3.16 
Merge-request: !4752
 2020-05-15 09:48:51 -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
e2f61e875f Merge branch 'release-3.17' 2020-05-15 09:44:54 -04:00
Brad King
e6175e03c7 Merge branch 'release-3.16' into release-3.17 2020-05-15 09:44:01 -04:00
Tushar Maheshwari
6728f0fa85 cmPropertyDefinitionMap: simplify and shorten 2020-05-15 18:58:02 +05:30
Brad King
1cc4bc4191 Merge branch 'release-3.16' 2020-05-15 09:16:58 -04:00
Brad King
784e665e1e Merge topic 'objc-env-vars' into release-3.17 
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