mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-24 07:08:38 -05:00
Code Issues Packages Projects Releases Wiki Activity
48,208 Commits 2 Branches 401 Tags
d806bd2e8c971aa60ddf8326a9470822a10b1ec6
Commit Graph

48208 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Maynard d806bd2e8c Tests: Update test suite to run in an Anaconda environment 2020-05-21 11:31:23 -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 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
Brad King bceca2fb47 Merge topic 'export-cmake-policy-version-range' 
ca24b70d31 Export: Specify a policy range in exported files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4755
 2020-05-20 09:06:17 -04:00
Brad King 1c73776e0b Merge branch 'release-3.16' 2020-05-20 09:04:09 -04:00
Brad King 66a7631d0a Merge branch 'release-3.17' 2020-05-20 09:03:23 -04:00
Brad King 4dfc7846f4 Merge topic 'vs-sln-version' 
88ad02f1ec VS: Restore .sln support for VS Version Selector

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4765
 2020-05-20 09:03:23 -04:00
Brad King 1174efb6f9 Merge topic 'vs-sln-version' into release-3.17 
88ad02f1ec VS: Restore .sln support for VS Version Selector

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4765
 2020-05-20 09:03:23 -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
Kitware Robot c8fdc54a3b CMake Nightly Date Stamp 2020-05-20 00:01:14 -04:00
Brad King 3aede31cfc ccmake: Check that getmaxyx result width is non-negative 
Otherwise GCC 10.1 issues a `-Wstringop-overflow=` diagnostic when
we use the width for indexing.
 2020-05-19 15:43:12 -04: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 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
Dmitry Kalinkin ef215b0851 cmFileCommand: Log cmsys::Glob warnings 2020-05-19 09:42:16 -04:00
Brad King 041e57a2b0 Merge branch 'vs-sln-version' into release-3.16 
Merge-request: !4765
 2020-05-19 08:39:59 -04:00
Brad King 88ad02f1ec VS: Restore .sln support for VS Version Selector 
Since commit 3b51343ea1 (VS: Emit UTF-8 BOM for generated solution files,
2019-08-19, v3.16.0-rc1~237^2) the `.sln` file does not work with the
VS Version Selector.  Add a newline after the BOM to restore support.

Fixes: #20725
 2020-05-19 08:24:37 -04:00
Kitware Robot cc79253fa4 CMake Nightly Date Stamp 2020-05-19 00:01:13 -04:00
Craig Scott ca24b70d31 Export: Specify a policy range in exported files 
This should reduce policy-related warnings coming from the
generated files, but in a way that doesn't increase the minimum
CMake version for consumers.

Relates: #20561
 2020-05-19 08:36:57 +10: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
Brad King ef4d992b54 Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2020-05-18 (146f6b36)
 2020-05-18 08:51:33 -04:00
KWSys Upstream 8fd4c19e1b KWSys 2020-05-18 (146f6b36) 
Code extracted from:

    https://gitlab.kitware.com/utils/kwsys.git

at commit 146f6b36442dec7a3315f5bfc4e3d71ffa943e53 (master).

Upstream Shortlog
-----------------

Brad King (2):
      e093a985 Glob: Append warning message only if destination is non-null
      25775078 Glob: Do not warn if top-level directory does not exist

Dmitry Kalinkin (3):
      9a3f9799 Directory: implement error reporting
      f33ef4e3 Glob: issue warnings on Directory errors
      97f880e6 Directory: add extra tests involving errorMessage
 2020-05-18 08:51:33 -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