mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-03 04:40:18 -05:00
Code Issues Packages Projects Releases Wiki Activity
50,215 Commits 2 Branches 401 Tags
5c2f9e3eeb89c50fa110daa1f33945381b1416ed
Commit Graph

3041 Commits

Author SHA1 Message Date
Haibo Huang 5c2f9e3eeb Android: Fatal if ABI is not supported by NDK 2020-10-09 09:49:19 -04:00
Brad King 62e73a7d10 Tests: Fix policy version in RunCMake.ExternalProject test 
Now that we have policies that need to be tested, this test cannot
just use CMAKE_VERSION for the policy level.
 2020-10-08 11:58:06 -04:00
Brad King bc19ceb6fe Merge topic 'check_cuda_helpers' 
5c66ac31e6 CUDA: CheckLinkerFlag now supports CUDA
da2622ff36 CUDA: Add Support to SourceCompiles|Runs and CheckCompilerFlags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5338
 2020-10-08 09:22:21 -04:00
Robert Maynard 5c66ac31e6 CUDA: CheckLinkerFlag now supports CUDA 2020-10-08 08:30:59 -04:00
Robert Maynard da2622ff36 CUDA: Add Support to SourceCompiles|Runs and CheckCompilerFlags 2020-10-08 08:30:59 -04:00
Brad King c4c86acaac Merge topic 'cmake-presets-empty-var' 
a395cb516b CMakePresets.json: Prohibit empty variable names

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5339
 2020-10-07 07:25:52 -04:00
Brad King c61f820a7f Merge topic 'add_ispc_to_check_helpers' 
e17e2c6a51 ISPC: CheckCompilerFlags and CheckSourceCompiles support ISPC

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5337
 2020-10-07 07:13:21 -04:00
Brad King 026beeb620 Merge topic 'CheckCompilerFlag-gcc-10' 
d66858c8e4 CheckCompilerFlag: Update the regex used to detect invalid options for GCC 10

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5331
 2020-10-07 07:12:31 -04:00
Kyle Edwards a395cb516b CMakePresets.json: Prohibit empty variable names 2020-10-06 12:09:38 -04:00
Brad King 8c4c658ab0 Merge topic 'cmake-presets' 
6f8fdc686c .gitignore: Add CMakeUserPresets.json
1d25760198 Help: Add presets documentation and release notes
a4382f72d7 CMake GUI: Add presets functionality
8617479061 CMake: Add presets functionality
06128cf949 Presets: Add cmCMakePresetsFile class
5a36542086 Refactor: Add allowArch parameter to cmake::CreateGlobalGenerator()
3059e6aed7 cmJSONHelpers: Add new Bind() function
8682d1b7b2 CMake GUI Tests: Increase default sleep time

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Michael Hirsch, Ph.D. <michael@scivision.dev>
Merge-request: !5169
 2020-10-06 10:49:59 -04:00
Robert Maynard e17e2c6a51 ISPC: CheckCompilerFlags and CheckSourceCompiles support ISPC 2020-10-06 10:47:20 -04:00
Luthaf d66858c8e4 CheckCompilerFlag: Update the regex used to detect invalid options for GCC 10 
The warning emmitted by GCC for invalid options have been updated to
read "command-line option XXX is valid ..." instead of "command line
option XXX is valid ...".  Update the regex to make it valid with both
the old and new warning message.

Fixes: #21275
 2020-10-06 10:38:18 -04:00
Brad King 990cf3c5d2 Merge topic 'add_checkcompilerflag_tests' 
8ac9719659 CheckCompilerFlag: Add tests to verify module correctness

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5328
 2020-10-06 08:18:46 -04:00
Robert Maynard 8ac9719659 CheckCompilerFlag: Add tests to verify module correctness 2020-10-06 07:07:02 -04:00
Brad King c814172e84 Merge topic 'csharp-source_group-bugfix' 
8d87cfdbf3 VS: Fix regression in C# source links

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5314
 2020-10-06 06:47:19 -04:00
Kinan Mahdi 8d87cfdbf3 VS: Fix regression in C# source links 
Fix logic used since commit ac6b18cd90 (CSharp: Add support for source
groups with out-of-source builds, 2020-02-18, v3.18.0-rc1~645^2).
Add a check of the physical file location for C# source groups.
 2020-10-05 12:49:14 -04:00
Kyle Edwards 8617479061 CMake: Add presets functionality 2020-10-05 09:49:59 -04:00
Craig Scott 1291dd3103 Merge topic 'xcode-refactor-framework-linking' 
ce2dee9e5b Xcode: Don't add framework as -framework argument in linker info list

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5216
 2020-10-04 17:05:57 -04:00
Craig Scott a771e2146a Merge topic 'FetchContent_missing_SOURCE_DIR' 
b030a6af88 FetchContent: Raise error if manually given source dir does not exist

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5317
 2020-10-04 17:02:11 -04:00
Craig Scott b030a6af88 FetchContent: Raise error if manually given source dir does not exist 
Fixes: #21208
 2020-10-03 18:46:08 +10:00
Marc Chevrier 127436192d FindSWIG: Fix syntax error 
Add some tests to cover all cases regarding version handling

Fixes: #21264
 2020-10-02 16:17:36 +02:00
Brad King a64c779746 Merge topic 'execute_process-fatal-error' 
116a427eb1 execute_process: add options for fatal errors on subprocess failure

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5243
 2020-10-02 08:38:53 -04:00
Gusts Kaksis ce2dee9e5b Xcode: Don't add framework as -framework argument in linker info list 2020-10-02 22:13:00 +10:00
Craig Scott 468bcc3291 Merge topic 'FindSWIG-version-range' 
1d300ee2a9 FindSWIG: Add version range support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5306
 2020-10-02 06:58:13 -04:00
Asit Dhal 116a427eb1 execute_process: add options for fatal errors on subprocess failure 
Fixes: #19930
 2020-10-01 17:07:44 +02:00
Brad King 2e8b85b040 Merge topic 'macos-arm64' 
b6c60f14b6 macOS: Default to arm64 architecture on Apple Silicon hosts
383e81aa60 Tests: Teach RunCMake to ignore Xcode internal objc warnings
8f75912176 Tests: Enable Assembler test case when CMAKE_OSX_ARCHITECTURES has one value

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5291
 2020-10-01 08:45:13 -04:00
Marc Chevrier 1d300ee2a9 FindSWIG: Add version range support 2020-10-01 12:00:29 +02:00
Mark Jansen 7bda9a7fc7 VS: Make ImportLibary generation optional 
Fixes: #21180
 2020-09-30 12:11:54 -04:00
Brad King 383e81aa60 Tests: Teach RunCMake to ignore Xcode internal objc warnings 
Xcode on Apple Silicon warns:

    objc[...]: Class AMSupportURL... is implemented in both ...
    One of the two will be used. Which one is undefined.

Teach RunCMake to drop such lines before matching against expected
output.
 2020-09-30 11:58:44 -04:00
Brad King d91c3e33cb Merge topic 'cmake_language-DEFER' 
e8b0359a43 cmake_language: Add signature to DEFER calls to later times
9880549405 cmake_language: Make all errors fatal
4f33f3dcff cmake_language(CALL): Accept empty ${var} expansions
4ebe9c4ce1 cmake_language(EVAL): Factor out internal helper
78ff24a3a7 Help: Use singular placeholder name in cmake_language signature
edd60d4419 Tests: Simplify RunCMake.cmake_language invalid command cases
1a5bf8245e cmMakefile: Clarify name of internal list file run method

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5262
 2020-09-30 11:55:33 -04:00
Craig Scott f002c1cfc7 Merge topic 'find-package-check-empty-version-range' 
212b0afb66 find_package: raise error on empty version range

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5294
 2020-09-30 08:22:49 -04:00
Brad King e8b0359a43 cmake_language: Add signature to DEFER calls to later times 
Fixes: #19575
 2020-09-29 17:12:33 -04:00
Brad King 4f33f3dcff cmake_language(CALL): Accept empty ${var} expansions 
Factor out an internal helper.  Generalize partial argument expansion
and call the helper on a clean boundary between raw arguments.
 2020-09-29 10:00:24 -04:00
Brad King b325484928 VS: Fix C language standard in target with C++ sources 
Add C-language standard to target-wide C++ settings.

Fixes: #21195
 2020-09-29 07:26:36 -04:00
Marc Chevrier 212b0afb66 find_package: raise error on empty version range 2020-09-29 13:06:09 +02:00
Brad King edd60d4419 Tests: Simplify RunCMake.cmake_language invalid command cases 2020-09-29 06:24:51 -04:00
Zack Galbreath ab9ad2a6a0 ctest: report make-level errors to CDash when using launchers 
Fixes: #19545
 2020-09-28 13:13:52 -04:00
Gregor Jasny 2092ab08fe xcode: conditionally enable combined install tests 
The new Xcode 12 build system does not support recursive
invocation. Therefore lazily triggered builds for the
corresponding platform which run during the `install` target
fail with:

```
error: unable to attach DB: error: accessing build database
```

While looking for a work-around we conditionally disable those
tests.

Issue: #21206
 2020-09-25 09:38:30 +02:00
Gregor Jasny 62ce9e16e0 xcode: annotate test output with selected SDK 2020-09-25 09:30:17 +02:00
Brad King 7b38161ca1 Merge topic 'check-source-modules' 
357e2ef429 CheckSoureRuns: Add a unified way to check if a source runs
10ae907de0 CheckSoureCompiles: Add a unified way to check if a source compiles
f5c928f73c Add a test to verify '\' handling in CHECK_CXX_SOURCE_COMPILES

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Michael Hirsch, Ph.D. <michael@scivision.dev>
Merge-request: !5223
 2020-09-24 15:12:59 -04:00
Craig Scott ac5195c408 Merge topic 'find_package-version-range' 
5b3356263c CMakePackageConfigHelpers: Add version range support
6bfc442fde FPHSA: add support of version range
d7df81067b find_package: Add support of version range
09095dbcd2 cmFindPackageCommand: Refactoring

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Michael Hirsch, Ph.D. <michael@scivision.dev>
Merge-request: !5226
 2020-09-24 07:29:03 -04:00
Robert Maynard 357e2ef429 CheckSoureRuns: Add a unified way to check if a source runs 2020-09-23 12:28:37 -04:00
Robert Maynard 10ae907de0 CheckSoureCompiles: Add a unified way to check if a source compiles 2020-09-23 12:28:37 -04:00
Brad King d827fdb6f9 Merge topic 'separate_arguments-program' 
d832c1cc7d separate_arguments: add option PROGRAM
f4c21d4953 separate_arguments: refactoring

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5253
 2020-09-23 12:05:26 -04:00
Brad King a41f375e65 Merge topic 'test-issue-21144' 
e02f677f61 Tests: Add test for early source lookup of file(GENERATE)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5248
 2020-09-23 12:04:37 -04:00
Marc Chevier 6bfc442fde FPHSA: add support of version range 2020-09-23 12:52:25 +02:00
Marc Chevier d7df81067b find_package: Add support of version range 
This enhancement is the first step for solving issue #21107
 2020-09-23 12:52:25 +02:00
Marc Chevrier d832c1cc7d separate_arguments: add option PROGRAM 
Fixes: #21217
 2020-09-22 16:32:34 +02:00
Marc Chevrier f4c21d4953 separate_arguments: refactoring 2020-09-22 16:32:34 +02:00
Brad King 966c3263c2 Merge topic 'file-ARCHIVE-compression-level' 
195d14e781 file(ARCHIVE_CREATE): Add option to control compression level

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Cristian Adam <cristian.adam@gmail.com>
Merge-request: !5242
 2020-09-22 07:43:31 -04:00