Commit Graph

34861 Commits

Author SHA1 Message Date
Roman Wüger
e1ee7b4305 CPack/NSIS: Avoid a race condition when generating the installer 2017-03-22 13:15:24 +01:00
Roman Wüger
09475c298b CPack/NSIS: Sign the uninstaller 2017-03-01 20:18:28 +01:00
Kitware Robot
77cbcb76bb CMake Nightly Date Stamp 2017-02-23 00:01:03 -05:00
Brad King
b803d00bc1 Merge branch 'release' 2017-02-22 10:17:54 -05:00
Brad King
dfebdd6218 Merge topic 'autogen_json'
29d96633 Autogen: Don't use .moc include in Q_PLUGIN_METADATA test
d60f1ddc Autogen: Documentation update
cdb72127 Autogen: Add release notes for Q_PLUGIN_METADATA support
8b13a52c Autogen: Tests: Set different compression levels in rcc test
9d1db7d7 Autogen: Overhaul and simplify AutogenInfo.cmake file generation
0ab817fa Autogen: Optimize GetCompileDefinitionsAndDirectories function
754d4318 Autogen: Sort AutogenInfo.cmake.in
cd74daf0 Autogen: Tests: Add Q_PLUGIN_METADATA test
39c4819e Autogen: Tests: Add moc include tests
50805693 Autogen: Tests: Clean comments
c23206b6 Autogen: Log simplifications
347572cf Autogen: Only touch an unchanged moc_compilation.cpp
03df033b Autogen: Rebuild moc when Q_PLUGIN_METADATA json file changes
3ec230de Autogen: Use GetRealPath in central places only
41fb64e7 Autogen: Search moc includes in include directories
175c8900 Autogen: Sort includes before composing include options
...
2017-02-22 10:15:48 -05:00
Brad King
dc32ad1988 Merge topic 'vs2017-fallback-sdk'
2da0838c VS2017: If Win 8.1 SDK is not available, use Win 10 SDK
2017-02-22 10:15:35 -05:00
Brad King
8aac0ae7c5 Merge topic 'ExternalProject-update-docs'
c95d017f ExternalProject: Clarify documented role of `INSTALL_DIR`
4b21290e ExternalProject: Clarify documented role of `INSTALL_COMMAND`
2017-02-22 10:15:29 -05:00
Kitware Robot
28df39ca8e CMake Nightly Date Stamp 2017-02-22 00:01:03 -05:00
Brad King
e9e8a5dc08 Merge branch 'vs2017-fallback-sdk' into release 2017-02-21 14:05:59 -05:00
Brad King
2da0838c64 VS2017: If Win 8.1 SDK is not available, use Win 10 SDK
We try to choose the Windows SDK version based on the version of Windows
targeted by the build.  However, if using VS 2017 without the Windows
8.1 SDK installed then we must fall back to the Windows 10 SDK even when
targeting an older version of Windows.

Inspired-by: gnaggnoyil <gnaggnoyil@gmail.com>
2017-02-21 13:47:54 -05:00
Brad King
3ccad39000 Merge topic 'cmake-host-system-name'
717e1f30 Use looked up uname path for command execution
0bbd993f Make CMAKE_HOST_SYSTEM_NAME available in scripting context
2017-02-21 11:14:03 -05:00
Brad King
f5d6d27168 Merge topic 'FindGTK2-old-sigc++'
2ab118a8 FindGTK2: handle old libsigc++ versions
2017-02-21 11:14:01 -05:00
Brad King
48ef9c5ae6 Merge topic 'cuda-separable-bool'
08fa0b45 CUDA: Fix boolean interpretation of CUDA_SEPARABLE_COMPILATION
2017-02-21 11:13:58 -05:00
Brad King
fe8f5b54f5 Merge branch 'ExternalProject-update-docs' into release 2017-02-21 11:11:27 -05:00
Brad King
0f6ebb5c0f Merge branch 'cuda-separable-bool' into release 2017-02-21 11:11:22 -05:00
Brad King
0b6afec62b Merge branch 'FindGTK2-old-sigc++' into release 2017-02-21 11:11:13 -05:00
Sebastian Holtermann
29d96633a4 Autogen: Don't use .moc include in Q_PLUGIN_METADATA test 2017-02-21 10:38:51 -05:00
Sebastian Holtermann
d60f1ddc39 Autogen: Documentation update
Closes #15254
2017-02-21 10:38:51 -05:00
Sebastian Holtermann
cdb72127dc Autogen: Add release notes for Q_PLUGIN_METADATA support 2017-02-21 10:38:51 -05:00
Sebastian Holtermann
8b13a52c49 Autogen: Tests: Set different compression levels in rcc test 2017-02-21 10:38:50 -05:00
Sebastian Holtermann
9d1db7d7c3 Autogen: Overhaul and simplify AutogenInfo.cmake file generation 2017-02-21 10:38:50 -05:00
Sebastian Holtermann
0ab817fa1e Autogen: Optimize GetCompileDefinitionsAndDirectories function 2017-02-21 10:38:50 -05:00
Sebastian Holtermann
754d431813 Autogen: Sort AutogenInfo.cmake.in
Also rename AM_SKIP_MOC to AM_MOC_SKIP
and AM_SKIP_UIC to AM_UIC_SKIP
2017-02-21 10:38:49 -05:00
Sebastian Holtermann
cd74daf06f Autogen: Tests: Add Q_PLUGIN_METADATA test 2017-02-21 10:38:49 -05:00
Sebastian Holtermann
39c4819eaa Autogen: Tests: Add moc include tests 2017-02-21 10:38:49 -05:00
Brad King
c95d017f9c ExternalProject: Clarify documented role of INSTALL_DIR
It does not actually configure the project to install to the given
location.  That must be done by passing the `<INSTALL_DIR>` placeholder
to the external project configuration step.
2017-02-21 10:32:26 -05:00
Wilfried Goesgens
4b21290e20 ExternalProject: Clarify documented role of INSTALL_COMMAND
It is for the install step of the external project and does not
affect installation of the calling project.
2017-02-21 10:32:25 -05:00
Sebastian Holtermann
50805693ba Autogen: Tests: Clean comments 2017-02-21 10:12:55 -05:00
Sebastian Holtermann
c23206b6c1 Autogen: Log simplifications
The logging methods now automatically add an end-of-line
to the message if it is missing.
2017-02-21 10:12:55 -05:00
Sebastian Holtermann
347572cf5e Autogen: Only touch an unchanged moc_compilation.cpp 2017-02-21 10:12:55 -05:00
Sebastian Holtermann
03df033bfa Autogen: Rebuild moc when Q_PLUGIN_METADATA json file changes
Closes #15419
2017-02-21 10:12:54 -05:00
Sebastian Holtermann
3ec230de1f Autogen: Use GetRealPath in central places only 2017-02-21 10:12:54 -05:00
Sebastian Holtermann
41fb64e719 Autogen: Search moc includes in include directories 2017-02-21 10:12:54 -05:00
Sebastian Holtermann
175c890044 Autogen: Sort includes before composing include options 2017-02-21 10:12:53 -05:00
Sebastian Holtermann
80a007534f Autogen: Add FindInIncludeDirectories method 2017-02-21 10:12:53 -05:00
Sebastian Holtermann
f379fdbb9e Autogen: Synchronize header/source argument names 2017-02-21 10:12:53 -05:00
Sebastian Holtermann
ddf940725e Autogen: Split moc include paths on info reading 2017-02-21 10:12:53 -05:00
Sebastian Holtermann
71c5ae253c Autogen: Loop based macro detection instead of code duplication 2017-02-21 10:12:52 -05:00
Sebastian Holtermann
5308f954c9 Autogen: Issue a warning if moc isn't required in strict mode 2017-02-21 10:12:52 -05:00
Sebastian Holtermann
887e400341 Autogen: Error message tweaks 2017-02-21 10:12:51 -05:00
Sebastian Holtermann
4c60099fea Autogen: Acquire and store header extensions in Init() 2017-02-21 10:12:51 -05:00
Sebastian Holtermann
815a05cf12 Autogen: Overhaul FindMatchingHeader function 2017-02-21 10:12:51 -05:00
Sebastian Holtermann
3270091210 Autogen: Don't list all search paths in error message 2017-02-21 10:12:50 -05:00
Sebastian Holtermann
793c9a7925 Autogen: Indentation fix 2017-02-21 10:12:50 -05:00
Sebastian Holtermann
25dbfbc2a9 Autogen: Rename moc related variables 2017-02-21 10:12:50 -05:00
Sebastian Holtermann
3cc42863a4 Autogen: Overhaul moc include list generation 2017-02-21 10:12:49 -05:00
Kitware Robot
8209b3238f CMake Nightly Date Stamp 2017-02-21 00:01:03 -05:00
Brad King
08fa0b4595 CUDA: Fix boolean interpretation of CUDA_SEPARABLE_COMPILATION
If the property is explicitly set to a non-true value we should
not treat it as true.
2017-02-20 17:05:35 -05:00
Ben Boeckel
2ab118a859 FindGTK2: handle old libsigc++ versions
Old versions of `libsigc++` do not have the version macros inside of its
`sigc++config.h` header. Assume nothing about such headers and report
version "zero".

Fixes: #16654
2017-02-20 11:58:57 -05:00
Brad King
3c0de6db2d Merge topic 'iwyu'
d58d28a9 ParserHelper: Move macros to bottom of files
07953c18 remove file cmStandardIncludes.h
f918b053 cmFortranParser: include what you use
b74314c6 cmDependsJavaParser: include what you use
74404df4 cmCommandArgumentParser: include what you use
e7168c08 cmExprParser: include what you use
ee72803e fix some include-what-you-use diagnostics
2017-02-20 10:43:07 -05:00