mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-06 13:51:33 -06:00
Code Issues Packages Projects Releases Wiki Activity
46,574 Commits 2 Branches 385 Tags
b6da71e299ccdd202f1ea35f33cfcfeb36467e1d
Commit Graph

1692 Commits

Author SHA1 Message Date
Brad King
b6da71e299 Merge topic 'osx-version-flags' 
6a84f0b791 macOS: Test OSX_COMPATIBILITY_VERSION and OSX_CURRENT_VERSION properties
4a62e3d97c macOS: Add OSX_COMPATIBILITY_VERSION and OSX_CURRENT_VERSION properties

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4274
 2020-01-28 10:59:03 -05:00
Brad King
1f9321c683 Merge topic 'cuda_runtime_library_controls' 
0d0145138f CUDA: Add abstraction for cuda runtime selection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4178
 2020-01-28 10:52:33 -05:00
Robert Maynard
0d0145138f CUDA: Add abstraction for cuda runtime selection 
Fixes #17559
Replace our hard-coded default of cudart=static with a first-class abstraction to select the runtime library from an enumeration of logical names.
 2020-01-27 16:02:26 -05:00
Brad King
d5f5496783 Merge topic 'cpack-dmg-rtf-for-sla' 
9571929701 CPack/DragNDrop: Support RTF licenses

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4270
 2020-01-27 09:32:51 -05:00
Isuru Fernando
4a62e3d97c macOS: Add OSX_COMPATIBILITY_VERSION and OSX_CURRENT_VERSION properties 
Fixes: #17652
 2020-01-24 14:13:41 -05:00
Brad King
786b56942b Merge topic 'vs-dotnet-standard-core' 
ae1e1909a1 VS: Add support for .NET Standard and .NET Core

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4240
 2020-01-24 10:55:26 -05:00
Andrew Fuller
9571929701 CPack/DragNDrop: Support RTF licenses 2020-01-24 07:48:52 -08:00
Joerg Bornemann
ae1e1909a1 VS: Add support for .NET Standard and .NET Core 
Fixes: #20105
 2020-01-24 09:11:05 -05:00
Brad King
afbbfe5109 MinGW: Update find_library to not find plain .dll files 
Modern distributions of packages built with MinGW tools provide `.dll.a`
import libraries.  Prefer those instead of finding plain `.dll` files.
This avoids accidentally finding unrelated Windows `.dll` files.

Fixes: #20019
 2020-01-20 13:31:45 -05:00
Brad King
bf3142e253 Merge topic 'fphsa-name-mismatch' 
be4d1bdf9a FPHSA: acknowledge the name mismatches in CMake-owned modules
ee4673c1ae FPHSA: detect package name mismatches

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Eric Noulard <eric.noulard@gmail.com>
Merge-request: !4123
 2020-01-20 11:53:14 -05:00
Brad King
cd6f6b2a9f Merge topic 'cmake-ctest-arguments' 
4153d8445b Add CMAKE_CTEST_ARGUMENTS variable to pass command-line arguments to ctest

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4168
 2020-01-17 09:40:23 -05:00
Craig Scott
808888aa47 Merge topic 'cpack-custom-dmg-names' 
6d6f4b9316 CPack/DragNDrop: Support CPACK_DMG_<component>_FILE_NAME
b53230fbee Tests: Add DragNDrop as a testable CPack generator

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4227
 2020-01-17 08:33:01 -05:00
Andrew Fuller
6d6f4b9316 CPack/DragNDrop: Support CPACK_DMG_<component>_FILE_NAME 2020-01-16 08:04:35 -08:00
Robert Goulet
4153d8445b Add CMAKE_CTEST_ARGUMENTS variable to pass command-line arguments to ctest 
Fixes: #20172
 2020-01-15 15:02:56 -05:00
Ben Boeckel
ee4673c1ae FPHSA: detect package name mismatches 
The `FPHSA_NAME_MISMATCHED` variable may be set if this is intentional
(but should be cleared after the call to not affect other FPHSA calls).
It may also be passed via the `NAME_MISMATCHED` option for new-signature
FPHSA calls.
 2020-01-14 17:25:49 -05:00
Brad King
47dac86c08 Merge topic 'xcode-default-warnings' 
b7b8331d68 Xcode: Drop hard-coded default warning flags like -Wmost

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4213
 2020-01-14 08:59:37 -05:00
Brad King
b7b8331d68 Xcode: Drop hard-coded default warning flags like -Wmost 
The `-Wmost` flag was added by commit 97a51d2172 (ENH: add more xcode
stuff, 2005-01-27, v2.4.0~2396), along with a couple others, as part of
very early work on the Xcode generator.  I suspect that the flags were
part of Xcode's project creation wizard.  However, they are not
appropriate for CMake-based projects because we already have our own
mechanisms for specifying flags desired by the project or user.
Simply drop the flags.

Fixes: #13516
 2020-01-13 11:45:23 -05:00
Brad King
4bac5b628e Merge topic 'target_compile_options-BEFORE-keyword' 
2678e31053 target_compile_options: ensure BEFORE keyword is handled in all scopes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4203
 2020-01-13 10:38:00 -05:00
Marc Chevrier
2678e31053 target_compile_options: ensure BEFORE keyword is handled in all scopes 
Fixes: #20200
 2020-01-11 01:25:25 +01:00
Kyle Edwards
78f9c9dd0e Merge topic 'nsis-headerimage' 
ebfffc609e CPack/NSIS: Add option for setting MUI_HEADERIMAGE_BITMAP

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4157
 2020-01-10 13:48:47 -05:00
Brad King
2ee6baef4f Merge topic 'ninja-postgen-commands' 
fb18215904 Ninja: clean ninja metadata once generated

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Jan Niklas Hasse <jhasse@bixense.com>
Merge-request: !3316
 2020-01-10 13:30:35 -05:00
Marc Chevrier
61502d3956 FindPython: Add variable Python_SOABI 
This variable holds the standard extension suffix for modules.

Fixes: #20150
 2020-01-09 14:43:22 +01:00
Ben Boeckel
fb18215904 Ninja: clean ninja metadata once generated 
Fixes: #15830
 2020-01-06 11:57:08 -05:00
Sebastian Holtermann
abad139c99 Autogen: Process .hh headers based on new policy CMP0100 settings 
Reintroduces .hh header processing in AUTOMOC and AUTOUIC based on the new
policy CMP0100 setting.

Fixes: #13904 CMAKE_AUTOMOC misses headers with ".hh" extension
 2020-01-04 11:33:04 +01:00
Kyle Edwards
e7675acacb Merge topic 'add_target_deprecation' 
c621839bd9 Add set_property option: DEPRECATION

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Daniele E. Domenichelli <ddomenichelli@drdanz.it>
Merge-request: !4128
 2020-01-03 11:30:48 -05:00
Joseph Snyder
c621839bd9 Add set_property option: DEPRECATION 
Add a new property flag for a target which contains a message regarding
deprecation status.

Add a warning at "Generate" time if a linked target is marked as
deprecated.

Expand ExportImport test to ensure that new property is being set and
passed correctly.  Ensure that the message is shown during the
"Generate" step run of the ExportImport test.
 2020-01-02 17:11:31 -05:00
Johnny Jazeix
ebfffc609e CPack/NSIS: Add option for setting MUI_HEADERIMAGE_BITMAP 
Fixes: #20120
 2020-01-02 22:27:31 +01:00
Sylvain Joubert
a179cbf205 FindLibXml2: provide imported target LibXml2::xmllint 2019-12-31 12:45:26 +01:00
Kyle Edwards
bb811568cc Merge topic 'traceJSON' 
e113ab1168 trace: Add test for the JSON-v1 trace
482497e0de trace: Add JSON output format

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4102
 2019-12-27 10:53:13 -05:00
Robert Maynard
4497a8672b Help: Add release notes for debugging find commands 2019-12-23 11:10:48 -05:00
Daniel Mensinger
482497e0de trace: Add JSON output format 
Add a new `--trace-format=` flag, to enable the new JSON trace
output format. This new format is easier to parse by machines
than the existing format. This new format also removes the
ambiguity of the whitespace in the "old" format (e.g. is that
whitespace part of a file path, or does it seperate arguments)
 2019-12-23 14:05:36 +01:00
Marc Chevrier
417c533010 Merge topic 'findpython_conda_support' 
776d27d4a4 FindPython: Extend virtual environment handling by considering conda

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4155
 2019-12-23 06:33:54 -05:00
Sebastian Müller
776d27d4a4 FindPython: Extend virtual environment handling by considering conda 
- Add functionality to recognize and use CONDA_PREFIX environment variable
- Add tests for conda virtual environments
- Fixes: #20111
 2019-12-21 15:38:00 +01:00
Ben Boeckel
f5126badd8 add_custom_command: convert DEPENDS path arguments to absolute paths 
This is only done if they are "obviously" paths in that they contain a
directory separator.

Fixes: #17111
 2019-12-18 13:57:07 -05:00
Stephen McDowell
2c0ff263b4 FindCUDAToolkit: Add module to find the CUDA Toolkit 2019-12-16 10:31:43 -05:00
Kyle Edwards
8c062f9d99 Help: Add documentation and release notes for multi-config Ninja 2019-12-13 10:52:07 -05:00
Kyle Edwards
966a9eece3 Merge topic 'function-var-current' 
24fdd51f45 Refactor: Replace CMAKE_CURRENT_LIST_DIR with CMAKE_CURRENT_FUNCTION_LIST_DIR
90e3e2a777 cmFunctionCommand: Introduce `CMAKE_CURRENT_FUNCTION*` variables
dd54290dab Refactor: Modernize `function` command

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !4000
 2019-12-12 14:00:41 -05:00
Brad King
4fb9c88042 Merge topic 'add_cuda_meta_compiler_features' 
2467a2b318 CUDA: Add cuda meta-features (e.g. ``cuda_std_11``) support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3992
 2019-12-12 11:57:18 -05:00
Brad King
0e0571599f Merge topic 'ctest-drmemory-support' 
676befdf52 ctest: add support for memcheck using Dr. Memory
2db0a65f56 cmCTestMemCheckHandler.cxx: minor refactoring

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4119
 2019-12-12 11:54:54 -05:00
Kyle Edwards
106137492b Merge topic 'ctest-configuration-type' 
e6f758be6d ctest: Populate CTEST_CONFIGURATION_TYPE from the -C command line when set

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4109
 2019-12-11 11:00:13 -05:00
Robert Maynard
2467a2b318 CUDA: Add cuda meta-features (e.g. `cuda_std_11`) support 2019-12-10 17:56:48 -05:00
Dietmar Scheidl
676befdf52 ctest: add support for memcheck using Dr. Memory 
Fixes: #19788
 2019-12-10 14:42:30 -05:00
Alex Turbov
90e3e2a777 cmFunctionCommand: Introduce CMAKE_CURRENT_FUNCTION* variables 
`CMAKE_CURRENT_FUNCTION`
  Can be used for diagnostic or debugging messages like the
  `__PRETTY_FUNCTION__` macro of GCC.

`CMAKE_CURRENT_FUNCTION_LIST_DIR`
  Eliminates the necessity of the additional "global"
  variables inside a module used to access additional "resource"
  files from functions defined in the module.

...
 2019-12-10 16:43:27 +02:00
Julien Jomier
e6f758be6d ctest: Populate CTEST_CONFIGURATION_TYPE from the -C command line when set 2019-12-09 13:10:59 -05:00
Brad King
b358f1827c Merge topic 'link-options-propagation' 
bbba701899 Link properties: must be transitive over private dependency on static library

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4120
 2019-12-09 11:32:05 -05:00
Marc Chevrier
bbba701899 Link properties: must be transitive over private dependency on static library 
Fixes: #20022
 2019-12-09 11:29:36 -05:00
Brad King
f62c674202 Merge topic 'foreach-ZIP_LISTS' 
d30468a2f6 foreach: Allow multiple iteration variables for `ZIP_LIST` mode
f3e51a2b1d foreach: Introduce `IN ZIP_LISTS` mode

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4021
 2019-12-09 11:25:35 -05:00
Brad King
1da7fa3b47 Merge topic 'compiler-launcher-env' 
6f48c59257 launcher: support setting a compiler launcher through the environment

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4095
 2019-12-09 11:19:57 -05:00
T.J. Corona
30488b3b9f FindLibArchive: create a target 2019-12-05 17:18:28 -05:00
Ben Boeckel
6f48c59257 launcher: support setting a compiler launcher through the environment 
This makes it much easier to use a launcher for all CMake projects in an
environment rather than having to remember to pass the setting to every
CMake build.
 2019-12-05 14:25:36 -05:00