mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-26 00:00:39 -05:00
Code Issues Packages Projects Releases Wiki Activity
48,746 Commits 2 Branches 401 Tags
d5b5c192780dbbf80ff7e049997c0eaeeebdeb95
Commit Graph

1506 Commits

Author SHA1 Message Date
Brad King d1492e93cf Merge topic 'improve_device_link_policy_cross_ref' 
e5279c2c8f Help: Better document that CMP0105 controls DEVICE_LINK parsing

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4919
 2020-06-18 12:45:27 -04:00
Brad King 4b6ba7c3d8 Merge topic 'doc-3.18-fixups' 
947cfc732d Help: Explicitly say transaction, don't abbreviate to trans
90c73479bc Help: Correct and condense examples for VS_SOLUTION_DEPLOY
0420de10b5 Help: Add missing cross-referencing for generator expressions
013f7a2647 Help: Formatting, crossref for FRAMEWORK_MULTI_CONFIG_POSTFIX_<CONFIG>
a12d53acf3 Help: Add missing PCH_WARN_INVALID docs and related cleanups
95a16f7805 Help: Fix formatting error and consistency for gtest_discover_tests()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4915
 2020-06-18 12:44:14 -04:00
Robert Maynard e5279c2c8f Help: Better document that CMP0105 controls DEVICE_LINK parsing 2020-06-18 12:07:26 -04:00
Craig Scott a12d53acf3 Help: Add missing PCH_WARN_INVALID docs and related cleanups 2020-06-18 20:26:03 +10:00
Brad King 158c6511e0 Merge topic 'cmake-E-compare_files-exit-code' 
b5b6075522 cmake: add dedicated error for -E compare_files invalid arguments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4881
 2020-06-16 09:09:32 -04:00
Asit Dhal b5b6075522 cmake: add dedicated error for -E compare_files invalid arguments 
Return 2 when user provides invalid arguments

Fixes: #20815
 2020-06-15 12:39:37 -04:00
Brad King 9d45a8be08 find_program: Find programs that are executable but not readable 
This fix was first made by commit 86e6349ef7 (find_program: Find
programs that are executable but not readable, 2020-04-04,
v3.18.0-rc1~372^2) but was reverted for compatibility.  Re-introduce it
with a policy for compatibility.

Fixes: #10468
 2020-06-15 11:58:47 -04:00
Marc Chevrier 056489d567 add_library/add_executable: allow local alias to imported targets 
Fixes: #20641
 2020-06-02 17:11:47 +02:00
Marc Chevrier 9436ad35df target_link_libraries: self-link through ALIAS is an error 
Fixes: #19617
 2020-05-30 11:47:39 +02:00
Marc Chevrier 1eca5993e2 ALIAS target: cannot overwrite an existing target 
Fixes: #19616
 2020-05-28 12:56:59 -04:00
Brad King a354b7f21e Merge topic 'CheckLinkerFlag-module' 
af96c0f4fa CheckLinkerFlag: Add module to check validity of linker flags
3c4cc77d55 Tests: Extend Fortran compiler information

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4777
 2020-05-25 10:59:01 -04:00
Marc Chevrier af96c0f4fa CheckLinkerFlag: Add module to check validity of linker flags 
Fixes: #15934
 2020-05-25 10:57:14 -04:00
Brad King 15b9b41d72 Merge topic 'fileApiAddPrecompileHeadersBacktrace' 
9f6d40ee23 fileapi: Extend codemodel targets with PRECOMPILE_HEADERS
b698764a31 Tests: Add a PCH example to RunCMake.FileAPI codemodel-v2
b3812c0e54 Tests: Fix indentation in RunCMake.FileAPI cxx_exe.json
9c48804b69 PCH: Fix source group of per-architecture PCH headers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4684
 2020-05-25 10:40:56 -04:00
Justin Goshi 9f6d40ee23 fileapi: Extend codemodel targets with PRECOMPILE_HEADERS 2020-05-22 11:26:55 -04:00
Brad King 62816ff88c Merge topic 'fortran-preprocess-property' 
3888de23da Ninja: Skip Fortran preprocessing if Fortran_PREPROCESS is OFF
66c4e87282 Ninja: Add helper functions to generate Fortran build
5cca1ec893 Ninja: Add helper functions to generate Fortran preprocess rule
b0a6161190 Fortran: Add Fortran_PREPROCESS property

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4659
 2020-05-22 10:35:10 -04:00
Brad King 94c1e4fdb3 cmake_language: Rename command from cmake_command 
Also rename the `INVOKE` signature to `CALL`.

Fixes: #20732
 2020-05-21 13:36:52 -04:00
Peter Hill b0a6161190 Fortran: Add Fortran_PREPROCESS property 
Issue: #18870
 2020-05-21 11:44:14 -04:00
Brad King a9559ccba5 Merge topic 'objc-env-vars' 
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
Brad King 16bf978e0c Merge branch 'backport-3.16-objc-env-vars' into objc-env-vars 2020-05-14 07:27:24 -04:00
Brad King ab9be6662f Help: Document OBJC and OBJCXX env vars for Objective C/C++ compilers 2020-05-14 07:10:06 -04:00
Brad King cee7eb8b3a Merge topic 'unity_explicit_groups' 
9f4eb352fe Unity Builds: Support explicit specification of sources to groups
b00585adcc Unity: Refactor implementation to make it easier to extend

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4716
 2020-05-11 10:08:12 -04:00
Robert Maynard 9f4eb352fe Unity Builds: Support explicit specification of sources to groups 
Instead of having CMake determine which files should go into each
unity file, the user can now use explicitly state the mapping.
 2020-05-07 11:13:34 -04:00
Alex Turbov e4f1b301fe cmake: Allow arbitrary args passed to CMake script 2020-05-06 21:40:36 +10:00
Julien Jemine 197b4cbe18 VS: Add option for per-target PlatformToolset 
Add a `VS_PLATFORM_TOOLSET` target property to set `PlatformToolset` in
the `.vcxproj` file for specific targets.  Document that this is safe
only when the named toolset uses the same underlying compiler as the
primary toolset.

Fixes: #17429
 2020-04-29 07:35:57 -04:00
Brad King 0e3a2d9b16 Merge topic 'ccmake-custom-colors' 
671fe28313 ccmake: Improve coloring, allow customization
f56a695440 ccmake: Rename cmCursesColor::{Options => Choice}

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4629
 2020-04-27 10:40:25 -04:00
Matthew Woehlke 671fe28313 ccmake: Improve coloring, allow customization 
Change the default color for strings from BLUE (which is nearly
illegible on any terminals using the standard color palette which has
been around since at least CGA, almost 40 years ago) to CYAN. Add
ability to customize the colors via an environment variable (inspired by
LS_COLORS and using similar syntax).

Fixes: #20596
 2020-04-24 11:21:13 -04:00
Brad King 61ac8e6dfa Merge topic 'remove-documentation-module' 
306a1ba960 Modules/Documentation: remove
ad4487a96a cmIncludeCommand: add infrastructure for deprecated modules

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4617
 2020-04-23 09:15:24 -04:00
Ben Boeckel 306a1ba960 Modules/Documentation: remove 
This is an old module from when VTK and other Kitware projects drove the
addition of commands and modules into CMake itself. Modern VTK doesn't
need this module and it can be ignored.

This module is kept around so that the ancient VTK versions which use it
are not broken by it. VTK itself stopped using the module in 2012 and
the last usage by an example in VTK was removed in 2020.

Fixes: #20591
 2020-04-22 10:46:03 -04:00
Brad King f9fbc78cd6 Merge topic 'ctest_stop_on_failure_16628' 
e89aeba5c4 ctest: add option --stop-on-failure

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4630
 2020-04-22 08:38:33 -04:00
Johnny Jazeix e89aeba5c4 ctest: add option --stop-on-failure 
To stop the tests once one has failed

Fixes: #16628
 2020-04-20 23:05:15 +02:00
Marc Chevrier 4248bb452a CUDA: Device linking use now link options 
properties LINK_OPTIONS and INTERFACE_LINK_OPTIONS are propagated
to the device link step.

To control which options are selected for normal link and device link steps,
the $<DEVICE_LINK> and $<HOST_LINK> generator expressions can be used.

Fixes: #18265
 2020-04-19 15:53:11 +02:00
Marc Chevrier 3fdae5acaa Genex: Add generator expressions $<DEVICE_LINK> and $<HOST_LINK> 
These generator expressions can only be used in link options properties.
These expressions return the arguments respectively for device and host link
step, otherwise return an empty string.
 2020-04-19 15:04:54 +02:00
Kyle Edwards 5f20e85412 Merge topic 'cat_cmd_20557' 
a625f30785 cmake -E: add cat command.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4600
 2020-04-16 11:35:55 -04:00
Brad King 7e8df1bb24 Merge topic 'cuda_architectures' 
21131ca60c CUDA: Add CudaOnly.CompileFlags test
f0931b0790 CUDA: Convert tests to use CUDA_ARCHITECTURES
e98588aaba CUDA: Add CUDA_ARCHITECTURES target property

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Patrick Stotko <stotko@cs.uni-bonn.de>
Merge-request: !4568
 2020-04-16 11:11:33 -04:00
Johnny Jazeix a625f30785 cmake -E: add cat command. 
Concatenate files and print on the standard output.

FIXES: #20557
 2020-04-15 20:56:56 +02:00
Raul Tambre e98588aaba CUDA: Add CUDA_ARCHITECTURES target property 
Simplifies CUDA target architecture handling.

Required for Clang support as Clang doesn't automatically select a supported architecture.
We detect a supported architecture during compiler identification and set CMAKE_CUDA_ARCHITECTURES to it.

Introduces CMP0104 for backwards compatibility with manually setting code generation flags with NVCC.

Implements #17963.
 2020-04-15 17:55:41 +03:00
Jean-Michaël Celerier 03b6f3a2e8 Help: Document the CMAKE_PREFIX_PATH environment variable 2020-04-14 10:04:58 -04:00
Brad King 2b9e3abcb5 Merge topic 'ctest-resource-file-cache' 
060d2ce269 CTest: Add CTEST_RESOURCE_SPEC_FILE variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4564
 2020-04-06 08:26:40 -04:00
Craig Scott 49b78e93a7 Merge topic 'docs-CMAKE_FIND_DEBUG_MODE' 
477b8b5dfe Help: Improve discoverability of CMAKE_FIND_DEBUG_MODE
218bda9671 Help: Fix CMAKE_FIND_DEBUG_MODE list formatting

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4569
 2020-04-06 06:34:15 -04:00
Craig Scott 477b8b5dfe Help: Improve discoverability of CMAKE_FIND_DEBUG_MODE 2020-04-04 19:59:35 +11:00
Kyle Edwards 060d2ce269 CTest: Add CTEST_RESOURCE_SPEC_FILE variable 2020-04-02 16:29:50 -04:00
Brad King ad22d0c1d0 Merge topic 'vs-non-built-file-item-metadata' 
0723e04f7a VS: Add documentation for VS_SETTINGS and VS_SOURCE_SETTINGS_<tool>.
2ca1102f83 VS: Test VS_SETTINGS and VS_SOURCE_SETTINGS_<tool> properties.
f00e1b816d VS: Add VS_SOURCE_SETTINGS_<tool> target property
2ce42f281f VS: Add VS_SETTINGS source file property
53116d3942 VS: Use unordered_map to write HLSL settings.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4498
 2020-03-30 13:28:19 -04:00
Matt Davies 0723e04f7a VS: Add documentation for VS_SETTINGS and VS_SOURCE_SETTINGS_<tool>. 2020-03-27 12:01:21 -04:00
Brad King f670435715 Merge topic 'pch-warn-invalid' 
2ce08e5489 PCH: add an option to disable `-Winvalid-pch`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4499
 2020-03-27 08:03:30 -04:00
Cristian Adam 2ce08e5489 PCH: add an option to disable -Winvalid-pch 
Fixes: #20295
 2020-03-26 14:24:46 +01:00
Marc Chevrier 0cd20e8f62 export(): raise an error on multiple calls with same FILE 
Fixes: 20472
 2020-03-26 13:20:45 +01:00
Brad King 0586123ede Merge topic 'trace-format-json-doc' 
1994f950ff cmake: List valid values for --trace-format on the command line
e39766d84a Help: Fix documentation of --trace-format parameter

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4500
 2020-03-19 06:57:52 -04:00
Kyle Edwards e39766d84a Help: Fix documentation of --trace-format parameter 2020-03-18 16:02:04 -04:00
Brad King 1b5554e863 Merge topic 'profiling' 
9aa4640792 cmake: add command line options to output script profiling data

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Acked-by: Pavel Solodovnikov <hellyeahdominate@gmail.com>
Acked-by: Leonid Pospelov <pospelovlm@yandex.ru>
Acked-by: Cristian Adam <cristian.adam@gmail.com>
Merge-request: !2760
 2020-03-13 10:59:03 -04:00
Craig Scott 3d388e5e98 Merge topic 'rename-macho-version-properties' into release-3.17 
14732d3f30 macOS: Rename OSX_*_VERSION properties to MACHO_*_VERSION

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4452
 2020-03-12 06:52:11 -04:00