Kitware Robot
0c38000393
CMake Nightly Date Stamp
2016-12-09 00:01:05 -05:00
Brad King
8acf5b78ef
Merge topic 'csharp_support_options_isdebug'
...
e438693e
2016-12-08 08:51:23 -05:00
Brad King
ba9fcedf6a
Merge topic 'vs-fix-standalone-Windows7.1SDK-toolset-for-master'
...
d42d378027431de1
2016-12-08 08:50:43 -05:00
Kitware Robot
c46145c61b
CMake Nightly Date Stamp
2016-12-08 00:01:05 -05:00
Michael Stürmer
e438693e95
VS: Teach option map IsDebug() method about C# projects
2016-12-07 11:49:43 -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'
...
f72ba42b45aa03b93bb2051e
2016-12-07 09:22:22 -05:00
Brad King
0478314e13
Merge topic 'QtAutogen_Contain'
...
c8a4147ae1f571a9e324d704c22117032da0875f5961db416d0a8af36731025243d77e1d98665c35df74f3ffbafbeaf18f437f3c360c3427b5409d04d9996aab
2016-12-07 08:38:51 -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
Sebastian Holtermann
8c6f990fb6
QtAutogen: New common bold logging method
2016-12-07 08:23:58 -05:00
Sebastian Holtermann
49f8687e16
QtAutogen: Make sure parent directory exists before writing files
2016-12-07 08:23:58 -05:00
Sebastian Holtermann
7731121d66
QtAutogen: Improved error handling
2016-12-07 08:23:58 -05:00
Sebastian Holtermann
00750ece6a
QtAutogen: Error and warning log method tweaks
2016-12-07 08:23:58 -05:00
Sebastian Holtermann
708e44af5d
QtAutogen: Improved error recognition
2016-12-07 08:23:57 -05:00
Sebastian Holtermann
1c97d1df20
QtAutogen: Improved error recognition on config load
2016-12-07 08:23:52 -05:00
Kitware Robot
b620772b11
CMake Nightly Date Stamp
2016-12-07 00:01:10 -05:00
Sebastian Holtermann
69871e67e3
QtAutogen: Comments
2016-12-06 15:59:27 +01:00
Sebastian Holtermann
9360e28816
QtAutogen: For loop feature test optimization
2016-12-06 15:59:27 +01:00
Sebastian Holtermann
8548caa3ee
QtAutogen: Variable scope optimizations
2016-12-06 15:59:27 +01:00
Sebastian Holtermann
9d9c68e21a
QtAutogen: Rename variable templates in config template
2016-12-06 15:59:27 +01:00
Sebastian Holtermann
bb8c96689f
QtAutogen: Make strings const
2016-12-06 15:59:27 +01:00
Sebastian Holtermann
48180401d3
QtAutogen: Rename config AM_RELAXED_MODE to AM_MOC_RELAXED_MODE
2016-12-06 15:59:26 +01:00
Sebastian Holtermann
4fa858ecb1
QtAutogen: Change config file permissions only on demand
2016-12-06 15:59:26 +01:00
Sebastian Holtermann
273e481e48
QtAutogen: Inline single use variable
2016-12-06 15:59:26 +01:00
Sebastian Holtermann
6f024008ce
QtAutogen: Remove unused intermediate definition in makefile
2016-12-06 15:59:26 +01:00
Sebastian Holtermann
ff1a01b743
QtAutogen: Moc related variable renamed
2016-12-06 15:59:26 +01:00
Sebastian Holtermann
f448364de8
QtAutogen: Moc related variable renamed
2016-12-06 15:59:26 +01:00
Sebastian Holtermann
4eadf2ce3f
QtAutogen: Target directory name function rename
2016-12-06 15:59:26 +01:00
Sebastian Holtermann
2e18801a1b
QtAutogen: Move util functions to file begin
2016-12-06 15:59:25 +01:00
Sebastian Holtermann
048aac2cf9
QtAutogen: Moc related setup function rename
2016-12-06 15:59:25 +01:00
Sebastian Holtermann
c9e2208278
QtAutogen: Uic related function rename
2016-12-06 15:59:25 +01:00
Sebastian Holtermann
26505dfcb7
QtAutogen: Uic related setup function rename
2016-12-06 15:59:25 +01:00
Sebastian Holtermann
fc055c04e1
QtAutogen: Rcc related function rename
2016-12-06 15:59:25 +01:00
Sebastian Holtermann
9eba41479b
QtAutogen: Rcc related function rename
2016-12-06 15:59:25 +01:00
