Commit Graph

34151 Commits

Author SHA1 Message Date
Kitware Robot
e3a93c66cc CMake Nightly Date Stamp 2016-12-13 00:01:05 -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
Kitware Robot
c46145c61b CMake Nightly Date Stamp 2016-12-08 00:01:05 -05:00
Henning Meyer
e326d8cf3e CPack/DEB shlibdep options depend on file utility
Missing or missconfigured file utility should not
skip adding dependencies. Instead it should print
out a fatal error message.

Fixes #16486
2016-12-07 22:25:06 +01:00
Michael Stürmer
e438693e95 VS: Teach option map IsDebug() method about C# projects 2016-12-07 11:49:43 -05:00
Brad King
f243a34cce Merge branch 'vs-fix-standalone-Windows7.1SDK-toolset' into release 2016-12-07 11:17:49 -05:00
Brad King
d42d3780ac Merge branch 'vs-fix-standalone-Windows7.1SDK-toolset' into vs-fix-standalone-Windows7.1SDK-toolset-for-master 2016-12-07 11:10:28 -05:00
Brad King
27431de162 VS: Fix standalone Windows7.1SDK toolset selection
Since commit v3.7.0-rc1~142^2~1 (VS: Explicitly default to v100 toolset
in Visual Studio 2010, 2016-07-21) we prefer to always set a platform
toolset explicitly so that `CMAKE_VS_PLATFORM_TOOLSET` can be reported.
However, the `v100` default for the VS 10 generator is not appropriate
for all environments.  We fixed support for VS 2010 Express Edition in
commit v3.7.0-rc1~142^2 (VS: Do not default to missing v100 64-bit
toolset on VS 2010 Express, 2016-09-09).

Fix support for the standalone Windows7.1SDK toolset environment by
recognizing the `PlatformToolset` environment variable that it sets to
`Windows7.1SDK` and using this as our default toolset instead.

Closes: #16483
2016-12-07 11:02:54 -05:00
Brad King
a0d64ecf8b Merge topic 'try_compile-lang-std'
f72ba42b try_compile: Add policy CMP0067 to honor language standards
45aa03b9 try_compile: Add options to specify language standards
3bb2051e try_compile: Stop processing when test build system fails to generate
2016-12-07 09:22:22 -05:00
Brad King
0478314e13 Merge topic 'QtAutogen_Contain'
c8a4147a QtAutogen: Release notes for the Contain branch
e1f571a9 QtAutogen: CMake-Qt documentation update
e324d704 QtAutogen: AUTOMOC documentation update
c2211703 QtAutogen: Tests: Don't use std::auto_ptr
2da0875f QtAutogen: Tests: Update ui_ include lookup directory
5961db41 QtAutogen: Tests: Increase minimum required CMake version
6d0a8af3 QtAutogen: Tests: Don't use std::auto_ptr
67310252 QtAutogen: Tests: Don't include CMAKE_CURRENT_BINARY_DIR
43d77e1d QtAutogen: Don't use std::i/ofstream::is_open()
98665c35 QtAutogen: Rename and sort variables
df74f3ff QtAutogen: Generate rcc output file names in one place only
bafbeaf1 QtAutogen: Add rcc output files to autogen target byproducts
8f437f3c QtAutogen: Add moc compilation file to autogen target byproducts
360c3427 QtAutogen: Reconfigure when .qrc file changes
b5409d04 QtAutogen: Rename autogen target to *_autogen from *_automoc
d9996aab QtAutogen: Inline single use variable definitions
...
2016-12-07 08:38:51 -05:00
Sebastian Holtermann
c8a4147a34 QtAutogen: Release notes for the Contain branch 2016-12-07 08:24:07 -05:00
Sebastian Holtermann
e1f571a983 QtAutogen: CMake-Qt documentation update 2016-12-07 08:24:07 -05:00
Sebastian Holtermann
e324d70409 QtAutogen: AUTOMOC documentation update 2016-12-07 08:24:06 -05:00
Sebastian Holtermann
c2211703d3 QtAutogen: Tests: Don't use std::auto_ptr 2016-12-07 08:24:06 -05:00
Sebastian Holtermann
2da0875f3a QtAutogen: Tests: Update ui_ include lookup directory 2016-12-07 08:24:06 -05:00
Sebastian Holtermann
5961db4143 QtAutogen: Tests: Increase minimum required CMake version 2016-12-07 08:24:05 -05:00
Sebastian Holtermann
6d0a8af368 QtAutogen: Tests: Don't use std::auto_ptr 2016-12-07 08:24:05 -05:00
Sebastian Holtermann
6731025211 QtAutogen: Tests: Don't include CMAKE_CURRENT_BINARY_DIR 2016-12-07 08:24:05 -05:00
Sebastian Holtermann
43d77e1dad QtAutogen: Don't use std::i/ofstream::is_open() 2016-12-07 08:24:04 -05:00