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
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
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
Sebastian Holtermann
98665c3519
QtAutogen: Rename and sort variables
2016-12-07 08:24:04 -05:00
Sebastian Holtermann
df74f3ff83
QtAutogen: Generate rcc output file names in one place only
2016-12-07 08:24:04 -05:00
Sebastian Holtermann
bafbeaf190
QtAutogen: Add rcc output files to autogen target byproducts
2016-12-07 08:24:03 -05:00
Sebastian Holtermann
8f437f3c35
QtAutogen: Add moc compilation file to autogen target byproducts
...
Closes : #16389
2016-12-07 08:24:03 -05:00
Sebastian Holtermann
360c342711
QtAutogen: Reconfigure when .qrc file changes
...
Add .qrc files to the CMake depends.
When the .qrc file changes the build system gets reconfigured
and the resource files watch list gets updated.
2016-12-07 08:24:03 -05:00
Sebastian Holtermann
b5409d04f1
QtAutogen: Rename autogen target to *_autogen from *_automoc
2016-12-07 08:24:02 -05:00
Sebastian Holtermann
d9996aab74
QtAutogen: Inline single use variable definitions
2016-12-07 08:24:02 -05:00
Sebastian Holtermann
b770b85d6c
QtAutogen: Determine the Qt major version in only one way
2016-12-07 08:24:01 -05:00
Sebastian Holtermann
5c3dc7460e
QtAutogen: Clean removes autogen build directory
...
Cleaning removes the entire autogen build directory instead
of single files.
2016-12-07 08:24:01 -05:00
Sebastian Holtermann
8c9358386b
QtAutogen: Generate included ui_ and moc_ files in _automoc/includes
...
ui_ and moc_ files that are include in source files get generated in
$CURRENT_BUILD_DIR/$TARGETNAME_automoc/include.
The directory is added to the INCLUDE_DIRECTORIES of the origin target
in the generation stage.
From now on all autogen files get generated below
$CURRENT_BUILD_DIR/$TARGETNAME_automoc.
2016-12-07 08:24:01 -05:00
Sebastian Holtermann
8f47a5f16a
cmGeneratorTarget: Add AddIncludeDirectory method (experimental)
2016-12-07 08:24:00 -05:00
Sebastian Holtermann
057ac11bfb
QtAutogen: Use checksum based subdirectories to avoid name collisions
2016-12-07 08:24:00 -05:00
Sebastian Holtermann
d3afe4070b
QtAutogen: Remove .dir suffix from automoc build directory
2016-12-07 08:23:59 -05:00
Sebastian Holtermann
6f53b1ab64
QtAutogen: Generate moc compilation in _automoc.dir/moc_compilation.cpp
2016-12-07 08:23:59 -05:00
Sebastian Holtermann
39e07d7a17
QtAutogen: Use upper case for MOC, UIC and RCC in messages
2016-12-07 08:23:59 -05:00