mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-07 22:59:56 -05:00
Code Issues Packages Projects Releases Wiki Activity
50,898 Commits 2 Branches 401 Tags
8187bd2f4bc54c9003cb0034b21530e3bfd24e8d
Commit Graph

1611 Commits

Author SHA1 Message Date
Craig Scott ea212834c0 Merge topic 'xcode-embed-frameworks' 
5651901c54 Xcode: add support for embedding frameworks

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Cameron Lowell Palmer <cameron.palmer@icloud.com>
Merge-request: !5418
 2020-11-29 16:54:15 -05:00
Craig Scott 5a868f1488 Merge topic 'presets-docs-bug' 
ca289abea5 Help: Fix presets typo (longDescription to displayName)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5541
 2020-11-29 16:02:00 -05:00
Sam Freed ca289abea5 Help: Fix presets typo (longDescription to displayName) 2020-11-28 16:32:31 +11:00
Gusts Kaksis 5651901c54 Xcode: add support for embedding frameworks 
This commit also prepares for embedding things other than
frameworks. In the future, we may want to embed resources and
other types supported by Xcode, so the target properties have
been documented in a way that clearly signals the future intent.
 2020-11-28 15:36:24 +11:00
Brad King 51ee82ddc6 Help: Restore documentation placeholder for removed modules 
In commit cb28d9af1f (UseJava: Move helper scripts to subdirectory,
2020-11-12) we removed modules that were not meant to be documented
publicly.  In order to keep links from older versions on `cmake.org` to
the "latest" documentation working for those modules, add placeholder
documents describing the change.
 2020-11-20 12:30:14 -05:00
Brad King c8b2331e8b Merge topic 'rename_cuda_memcheck' 
fea49b2df0 CTest: Rename CudaMemcheck to CudaSanitizer

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5514
 2020-11-18 07:29:54 -05:00
Tobias Ribizel fea49b2df0 CTest: Rename CudaMemcheck to CudaSanitizer 2020-11-17 21:06:30 +01:00
Brad King c00a6d3967 MSVC: Do not add /GR to CMAKE_CXX_FLAGS by default 
The `/GR` flag has been on by default since MSVC cl 14.0 from VS 2005.
Remove it from the default flags to make it easier for projects to pass
`/GR-` themselves to turn it off.

Projects may be using string processing to replace `/GR` with another
flag, so we cannot simply drop it.  Add a policy to drop it in a
compatible way.

Fixes: #21428
 2020-11-13 11:46:23 -05:00
Nikita Nemkin cb28d9af1f UseJava: Move helper scripts to subdirectory 
Also, exclude them from the help module index.
 2020-11-12 20:14:05 +05:00
Craig Scott 9201b3fa40 Merge topic 'help_ctest_cuda_memcheck' 
e620bb7293 Help: Add cuda-memcheck to CTest documentation
fb98883e2b CTest: Add cuda-memcheck to Dart and CTest module

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5469
 2020-11-06 05:50:53 -05:00
Tobias Ribizel e620bb7293 Help: Add cuda-memcheck to CTest documentation 
Issue: #21388
 2020-11-05 10:05:01 -05:00
Brad King a9e2b18bf3 Merge topic 'android-stl' 
4dca078829 Android: Link c++abi and android_support when necessary
738caa4d48 Android: Add options to control exceptions/rtti

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5444
 2020-11-05 07:55:46 -05:00
Haibo Huang 738caa4d48 Android: Add options to control exceptions/rtti 
With the NDK's `android.toolchain.cmake`, the user can control whether
exceptions/rtti is enabled using `ANDROID_CPP_FEATURES`:

  https://android.googlesource.com/platform/ndk/+/43b2de34ef9e3a70573fe51a9e069f985a4be5b9/build/cmake/android.toolchain.cmake#548

Add `CMAKE_ANDROID_RTTI` and `CMAKE_ANDROID_EXCEPTIONS` to support that.
 2020-11-04 14:18:03 -05:00
Brad King f511a1c009 CMakeDetermineCompilerABI: Detect byte order as part of check 
We already detect `sizeof(void*)`.  Detect the byte order as part of the
same check.

Issue: #21392
 2020-11-04 10:08:13 -05:00
Marc Chevrier 1c912056a1 cmake_path: remove new command from 3.19 
Defer adding this command until post-3.19 development so that it
has more time to mature before being included in a release.

Issue: #21385
 2020-11-03 09:55:35 -05:00
Brad King 4e59b42264 Merge topic 'cmake-gui-manual-argument' 
ef03124237 CMake GUI: Add --browse-manual argument

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5417
 2020-10-28 07:37:08 -04:00
Kyle Edwards ef03124237 CMake GUI: Add --browse-manual argument 2020-10-27 12:05:41 -04:00
Craig Scott 105ef112c9 Merge topic 'cmake-presets-path-arg' 
b7d7eca66d CMakePresets.json: Rework how --preset argument is handled

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5416
 2020-10-27 07:33:46 -04:00
Kyle Edwards b7d7eca66d CMakePresets.json: Rework how --preset argument is handled 
If a path argument with no -S or -B leads to a cache directory,
use that directory as the binary directory. Otherwise, use the
binary directory from the preset.

Fixes: #21311
 2020-10-26 22:32:45 +11:00
Craig Scott 5e1858c0c2 Merge topic 'cmake-presets-toolset-arch-config' into release-3.19 
64afabdbcb CMakePresets.json: Split cmakeGeneratorConfig field

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5387
 2020-10-23 06:37:56 -04:00
Craig Scott dbd1d737f9 Merge topic 'cmake-presets-toolset-arch-config' 
64afabdbcb CMakePresets.json: Split cmakeGeneratorConfig field

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5387
 2020-10-23 06:37:56 -04:00
Craig Scott 5d20e6d803 Merge topic 'cmake-presets-source-dir-name' 
25742c589c CMakePresets.json: Add ${sourceDirName} macro

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: Craig Scott <craig.scott@crascit.com>
Merge-request: !5386
 2020-10-23 06:36:03 -04:00
Kyle Edwards 64afabdbcb CMakePresets.json: Split cmakeGeneratorConfig field 
Make this field separate for both architecture and toolset. Allow
architecture and toolset to be either strings or objects with value
and strategy fields.

Fixes: #21317
 2020-10-22 11:24:39 -04:00
Kyle Edwards 25742c589c CMakePresets.json: Add ${sourceDirName} macro 
Fixes: #21312
 2020-10-22 11:09:28 -04:00
Kyle Edwards 6abe14d226 Merge topic 'cmake-presets-boolean-cache' 
920d180047 CMakePresets.json: Allow boolean for cache variable value

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5398
 2020-10-22 11:04:19 -04:00
Kyle Edwards 920d180047 CMakePresets.json: Allow boolean for cache variable value 
Fixes: #21327
 2020-10-21 10:37:08 -04:00
Kyle Edwards cf6ac2d365 Merge branch 'master' into cmakepresets-schema 2020-10-20 14:51:42 -04:00
Ben McMorran 0307f7c980 Help: Add JSON schema for CMakePresets.json 2020-10-20 12:07:09 -04:00
Kyle Edwards 54a5c026d0 Merge topic 'cmake-presets-doc-move' 
4a123fc28c Help: Clarify purpose of warnings and errors
6c74bcfc20 Help: Make architecture and toolset descriptions generic
45766789a0 Help: Add inheritance to CMakePresets.json example
88c9d6f6eb Help: Add documentation for debug field
efab856008 Help: Show environment field
2208db114c Help: Show multiple ways of doing cacheVariables
d30f85193f Help: Move vendor field into example
b9c8c57860 Help: s/unusedVars/unusedCli/
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5373
 2020-10-20 11:59:54 -04:00
Kyle Edwards 4a123fc28c Help: Clarify purpose of warnings and errors 2020-10-19 10:29:19 -04:00
Kyle Edwards 6c74bcfc20 Help: Make architecture and toolset descriptions generic 2020-10-19 10:29:19 -04:00
Kyle Edwards 45766789a0 Help: Add inheritance to CMakePresets.json example 2020-10-19 10:29:19 -04:00
Kyle Edwards 88c9d6f6eb Help: Add documentation for debug field 
Oops!
 2020-10-19 10:25:57 -04:00
Kyle Edwards efab856008 Help: Show environment field 2020-10-19 10:25:57 -04:00
Kyle Edwards 2208db114c Help: Show multiple ways of doing cacheVariables 
This demonstrates both the simple string and the complex object,
and ensures that they get automated testing.
 2020-10-19 10:25:57 -04:00
Kyle Edwards d30f85193f Help: Move vendor field into example 
This ensures that the vendor field gets automated testing from the
example.
 2020-10-19 10:25:57 -04:00
Kyle Edwards b9c8c57860 Help: s/unusedVars/unusedCli/ 
This was a mistake in the documentation.

Fixes: #21303
 2020-10-19 10:25:57 -04:00
Kyle Edwards c436aaaad1 Help: Move CMakePresets.json documentation into a separate file 2020-10-19 10:25:57 -04:00
Brad King 860e40de6b Merge topic 'doc-CMP0111' 
5c3a91c808 CMP0111: Clarify that the new error is on a missing property setting

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alex Reinking <alex_reinking@berkeley.edu>
Merge-request: !5385
 2020-10-19 10:23:50 -04:00
Brad King 5c3a91c808 CMP0111: Clarify that the new error is on a missing property setting 
The previous wording could be confused with the file missing on disk.
 2020-10-16 08:26:00 -04:00
Brad King 9952ee063a server: remove deprecated 'cmake -E server' mode 
The server mode has been deprecated since commit 996e1885c4 (server:
deprecate in favor of the file-api, 2019-04-19, v3.15.0-rc1~198^2).
Clients should now be using the file-api.  Remove the server mode.
 2020-10-14 16:41:50 -04:00
Brad King c555959717 Merge topic 'ninja-depfile-transformation' 
146e1e6ba1 Ninja: Transform DEPFILEs with policy CMP0116
596439b1bb cmCustomCommandGenerator: Add option to transform depfile
b2c14bc774 cmake -E: Add cmake_transform_depfile internal command
946adadd40 cmGccDepfileReader: Rework helper code

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5325
 2020-10-14 11:49:51 -04:00
Kyle Edwards e41009fe9e Merge topic 'cmake-help-fix' 
7d811ceb3a Help: Fix invalid code-block in cmake(1) manual

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5369
 2020-10-14 10:09:06 -04:00
Kyle Edwards 7d811ceb3a Help: Fix invalid code-block in cmake(1) manual 
Fixes: #21304
 2020-10-14 09:47:28 -04:00
Kyle Edwards 146e1e6ba1 Ninja: Transform DEPFILEs with policy CMP0116 
Fixes: #21267
 2020-10-13 10:19:46 -04:00
Kyle Edwards a1988e4c80 Merge topic 'explicit-source-extensions' 
fd50a75fa0 CMP0115: Require source file extensions to be explicit

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5346
 2020-10-13 10:17:14 -04:00
Kyle Edwards fd50a75fa0 CMP0115: Require source file extensions to be explicit 2020-10-13 09:46:54 -04:00
Kyle Edwards 94c955e508 Tests: Test the CMakePresets.json example in the documentation 2020-10-09 15:35:54 -04:00
Kyle Edwards d6af1e83bc Help: Fix documentation of CMakePresets.json's cacheVariables 
cacheVariables is a map with variable names as the keys, but the
example in the documentation was not updated to reflect this. Fix
the example.
 2020-10-09 11:41:47 -04:00
Kyle Edwards 0a638e86b2 Help: Add note about Visual Studio tools for Android 2020-10-07 10:24:38 -04:00