mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-04 12:49:36 -06:00
Code Issues Packages Projects Releases Wiki Activity
34,168 Commits 2 Branches 385 Tags
58f02aaa4df6dcdac917ff7af7db2a7a1eb040f9
Commit Graph

34168 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
58f02aaa4d Help: Clarify meaning of CMAKE_CL_64 
Closes: #16504
 2016-12-14 11:11:55 -05:00
Brad King
858081c2f9 Merge topic 'cuda-implicit-libs' 
e3f404fe CUDA: Implement nvcc implicit link line extraction more robustly
 2016-12-14 09:52:08 -05:00
Brad King
788581883f Merge topic 'rebuild-lexers' 
c5df1f16 Regenerate lexer source code
 2016-12-14 09:52:05 -05:00
Brad King
60e5f61917 Merge topic 'dotnet_hint_references' 
55da7e50 VS: add support for .NET references with hint paths
 2016-12-14 09:52:02 -05:00
Brad King
2674818ee1 Merge topic 'GNUInstallDirs-cache-type' 
53b5d634 GNUInstallDirs: Set UNINITALIZED cache properties to type PATH
c968213d GNUInstallDirs: Unify path logic into helper macros
 2016-12-14 09:51:59 -05:00
Brad King
062645ca67 Merge topic 'update-kwsys-upstream-link' 
23a35edf pre-commit: Update KWSys rejection message for new upstream location
 2016-12-14 09:51:56 -05:00
Daniel Pfeifer
c5df1f165c Regenerate lexer source code 
Revise the manual procedure in the `*Lexer.in.l` files.  Some of our
post-processing steps are no longer necessary with the current set of
supported compilers.  Some steps changed with newer versions of flex.

Then regenerate all lexers with flex version 2.6.1.
 2016-12-14 09:40:33 -05:00
Kitware Robot
61001557d4 CMake Nightly Date Stamp 2016-12-14 00:01:04 -05:00
Brad King
23a35edf4d pre-commit: Update KWSys rejection message for new upstream location 2016-12-13 14:40:39 -05:00
Michael Stürmer
55da7e501e VS: add support for .NET references with hint paths 2016-12-13 13:51:50 -05:00
Brad King
e3f404fe29 CUDA: Implement nvcc implicit link line extraction more robustly 
Do not assume that the implicit link line is the last line of the output
from `nvcc -v`.  Instead first find the `LIBRARIES=` line, and then look
for that content on a later line.  It appears twice.  First on a call to
`nvlink`, which we ignore.  Later it appears on the implicit link line.
Extract the latter line.  On failure, abort with a `FATAL_ERROR` so that
the user does not try to build without proper link information.

Once we have the line, parse it with `separate_arguments` using the
`UNIX_COMMAND` option just like `CMakeParseImplicitLinkInfo` already
does.  This robustly parses the command line and removes quoting.
Then extract the first argument as the host link launcher.
 2016-12-13 11:01:40 -05:00
Brad King
10ca398b44 Merge topic 'try_compile-lang-std-cuda' 
1371eec4 try_compile: extend CMP0067 to honor language standards for CUDA.
 2016-12-13 08:45:54 -05:00
Brad King
c241679956 Merge topic 'GetPrerequisites-fix-find_program-call' 
1d1f29f4 GetPrerequisites: Fix call to find_program for `ri` tool
 2016-12-13 08:45:50 -05:00
Kitware Robot
e3a93c66cc CMake Nightly Date Stamp 2016-12-13 00:01:05 -05:00
Roger Leigh
53b5d6345d GNUInstallDirs: Set UNINITALIZED cache properties to type PATH 
Also convert the path to a cmake path
 2016-12-12 22:23:26 +00:00
Roger Leigh
c968213d2e GNUInstallDirs: Unify path logic into helper macros 
- Unify path handling: Rather than repeat the same logic for each
  individual path create two macros which can be used throughout
  the module.
- Capitalise helpstrings to match the conventions used by the
  standard CMake properties
 2016-12-12 22:22:44 +00:00
Robert Maynard
1371eec4c3 try_compile: extend CMP0067 to honor language standards for CUDA. 2016-12-12 14:39:32 -05:00
Martin Koegler
1d1f29f435 GetPrerequisites: Fix call to find_program for ri tool 
`find_program` does not work with `${a};${b}` as a search path.
Use separate arguments to `PATHS`.
 2016-12-12 14:27:21 -05:00
Brad King
3d3d3f9470 Merge topic 'cuda-fixups' 
c1a55079 CUDA: Fix Cuda.Complex test case extern function signatures
7552d16d CUDA: Fix default compiler flag initialization
 2016-12-12 14:21:33 -05:00
Brad King
7b47ce5a3a Merge topic 'document_cuda_standard_property' 
45054119 Help: Document CUDA_STANDARD and related properties
 2016-12-12 14:21:30 -05:00
Brad King
d1d11f73a1 Merge topic 'clang-tidy' 
b932cd42 clang-tidy: apply misc-redundant-expression fixes
88da3d68 clang-tidy: apply misc-suspicious-string-compare fixes
58c66393 clang-tidy: apply readability-static-definition-in-anonymous-namespace fixes
85bfddda clang-tidy: apply readability-redundant-control-flow fixes
2988abd9 clang-tidy: apply modernize-use-bool-literals fixes
a74e6893 clang-tidy: apply readability-redundant-string-init fixes
cac529dd clang-tidy: apply performance-faster-string-find fixes
7c9db8f8 clang-tidy: apply performance-unnecessary-value-param fixes
 2016-12-12 14:21:27 -05:00
Brad King
55ff3c78b3 Merge topic 'xcode-message-extension' 
9ac0c393 Help: Add notes for topic 'xcode-message-extension'
0ae46321 Xcode: Add target property to override explicitFileType
7ecac703 Xcode: Add target property to override productType
 2016-12-12 14:21:23 -05:00
Brad King
ce71bd9505 Merge topic 'fix-ctest-launchers' 
db61cd5d cmRulePlaceholderExpander: Remove unused member RuleLauncher
b7771078 Comment ExpandRuleVariables calls not preceded by launcher insertion
c58a5198 Makefile: Restore RULE_LAUNCH_COMPILE generation on compilation rules
 2016-12-12 14:21:20 -05:00
Brad King
9ac0c3936e Help: Add notes for topic 'xcode-message-extension' 2016-12-12 14:20:42 -05:00
Daniel Pfeifer
b932cd4298 clang-tidy: apply misc-redundant-expression fixes 2016-12-12 14:04:16 -05:00
Daniel Pfeifer
88da3d68c2 clang-tidy: apply misc-suspicious-string-compare fixes 2016-12-12 14:04:16 -05:00
Daniel Pfeifer
58c66393cf clang-tidy: apply readability-static-definition-in-anonymous-namespace fixes 2016-12-12 14:04:15 -05:00
Daniel Pfeifer
85bfdddaf7 clang-tidy: apply readability-redundant-control-flow fixes 2016-12-12 14:04:14 -05:00
Daniel Pfeifer
2988abd939 clang-tidy: apply modernize-use-bool-literals fixes 2016-12-12 14:04:14 -05:00
Daniel Pfeifer
a74e689348 clang-tidy: apply readability-redundant-string-init fixes 2016-12-12 14:04:13 -05:00
Daniel Pfeifer
cac529dd49 clang-tidy: apply performance-faster-string-find fixes 2016-12-12 14:04:13 -05:00
Daniel Pfeifer
7c9db8f813 clang-tidy: apply performance-unnecessary-value-param fixes 2016-12-12 14:04:12 -05:00
Kitware Robot
3874843f0f CMake Nightly Date Stamp 2016-12-12 00:01:04 -05:00
Kitware Robot
cf2d33305f CMake Nightly Date Stamp 2016-12-11 00:01:05 -05:00
Kitware Robot
b88843d651 CMake Nightly Date Stamp 2016-12-10 00:01:08 -05:00
Brad King
44ddd889af Merge branch 'release' 2016-12-09 14:25:41 -05:00
Brad King
c7cd379179 Merge topic 'FindBoost-vs15' 
c3b6b5ba FindBoost: Add support for VS 2017
 2016-12-09 14:23:50 -05:00
Brad King
c1a5507917 CUDA: Fix Cuda.Complex test case extern function signatures 
Make the return types of the extern function declared in `main.cpp`
match those in the method implementations.
 2016-12-09 14:19:22 -05:00
Brad King
7552d16d1a CUDA: Fix default compiler flag initialization 
Since commit v3.7.0-rc1~392^2 (Honor CMAKE_<LANG>_FLAGS[_<CONFIG>]_INIT
set in toolchain files, 2016-07-05) our convention is to initialize
compiler flag variables via `string(APPEND)` rather than `set()`.
Fix the convention for `CMAKE_CUDA_FLAGS[_<CONFIG>]_INIT`.
 2016-12-09 14:19:22 -05:00
Robert Maynard
4505411982 Help: Document CUDA_STANDARD and related properties 2016-12-09 14:13:06 -05:00
Brad King
db61cd5d72 cmRulePlaceholderExpander: Remove unused member RuleLauncher 2016-12-09 08:59:17 -05:00
Brad King
b7771078ad Comment ExpandRuleVariables calls not preceded by launcher insertion 
Call sites of `ExpandRuleVariables` are now responsible for inserting
the `RULE_LAUNCH_{COMPILE,LINK,CUSTOM}` values in rule command lines.
Audit all call sites and add a comment to each one that does not insert
a launcher to explain why.
 2016-12-09 08:59:17 -05:00
Brad King
c58a5198e5 Makefile: Restore RULE_LAUNCH_COMPILE generation on compilation rules 
Refactoring in commit 425cd167 (cmLocalGenerator: Remove the launcher
from RuleVariables, 2016-10-09) accidentally broke Makefile generator
handling of `RULE_LAUNCH_COMPILE`.  Responsibility moved from
`ExpandRuleVariables` to its call sites, and the Makefile generator call
site for compilations was not properly updated.  Fix it now.
 2016-12-09 08:59:17 -05:00
Kitware Robot
0c38000393 CMake Nightly Date Stamp 2016-12-09 00:01:05 -05:00
Brad King
1dd3e21a54 Merge branch 'release' 2016-12-08 08:54:19 -05:00
Brad King
8acf5b78ef Merge topic 'csharp_support_options_isdebug' 
e438693e VS: Teach option map IsDebug() method about C# projects
 2016-12-08 08:51:23 -05:00
Brad King
e9286c9e0f Merge topic 'cpack-deb-missing-file-utility-error' 
e326d8cf CPack/DEB shlibdep options depend on file utility
 2016-12-08 08:51:11 -05:00
Brad King
ba9fcedf6a Merge topic 'vs-fix-standalone-Windows7.1SDK-toolset-for-master' 
d42d3780 Merge branch 'vs-fix-standalone-Windows7.1SDK-toolset' into vs-fix-standalone-Windows7.1SDK-toolset-for-master
27431de1 VS: Fix standalone Windows7.1SDK toolset selection
 2016-12-08 08:50:43 -05:00
Brad King
12bea47fa4 Merge branch 'FindBoost-vs15' into release 2016-12-08 08:25:08 -05:00
Vic Luo
c3b6b5babc FindBoost: Add support for VS 2017 2016-12-08 08:20:08 -05:00