Commit Graph

22260 Commits

Author SHA1 Message Date
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
Kitware Robot
28df39ca8e CMake Nightly Date Stamp 2017-02-22 00:01:03 -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
48ef9c5ae6 Merge topic 'cuda-separable-bool'
08fa0b45 CUDA: Fix boolean interpretation of CUDA_SEPARABLE_COMPILATION
2017-02-21 11:13:58 -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
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
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
Brad King
66094d1224 Merge topic 'productbuild_component_plist'
d32f9deb CPack: Add option to specify --component-plist for productbuild
2017-02-20 10:43:05 -05:00
Brad King
5d17b68c67 Merge topic 'productbuild_resources'
734581f4 CPack: Add support for CPACK_PRODUCTBULID_RESOURCES_DIR
2017-02-20 10:43:02 -05:00
Brad King
168420f35c Merge topic 'fix-CMAKE_ROOT-case'
3287ba02 Make CMAKE_ROOT independent of case of path used to invoke cmake
2017-02-20 10:43:00 -05:00
Brad King
53a1ec631d Merge topic 'fix-CMP0017-path-case'
e2d78f75 Windows: Fix inconsistent behavior on changes to case of path to cmake
2017-02-20 10:42:57 -05:00
Daniel Pfeifer
d58d28a941 ParserHelper: Move macros to bottom of files
Since the class name is used in the macros, the iwyu tool gets confused
wheter it needs a forward declaration or not.

While editing the files, make sure structs have no typedef.  Also,
remove confusing comments about Java.
2017-02-20 10:35:55 -05:00
Daniel Pfeifer
07953c18f3 remove file cmStandardIncludes.h 2017-02-20 10:35:55 -05:00
Daniel Pfeifer
f918b053b2 cmFortranParser: include what you use 2017-02-20 10:35:55 -05:00
Kitware Robot
d36016a8ff CMake Nightly Date Stamp 2017-02-20 00:01:02 -05:00
Gregor Jasny
0bbd993f61 Make CMAKE_HOST_SYSTEM_NAME available in scripting context 2017-02-19 19:27:34 +01:00
Sebastian Holtermann
074534a56d Autogen: Inline string generation 2017-02-19 12:35:43 +01:00
Sebastian Holtermann
a51f1a91d9 Autogen: Synchronize variable names 2017-02-19 12:35:43 +01:00
Sebastian Holtermann
b2063fd70f Autogen: Move method declarations; Remove comments 2017-02-19 12:35:43 +01:00
Sebastian Holtermann
10beb4a034 Autogen: Rename SkipFoo variables/methods to FooSkip 2017-02-19 12:35:43 +01:00
Sebastian Holtermann
f37f1a647d Autogen: Split moc options info string immediately 2017-02-19 12:35:43 +01:00
Sebastian Holtermann
5bb997c24a Autogen: Split moc compile options info string immediately 2017-02-19 12:35:42 +01:00
Sebastian Holtermann
a9e3c903b6 Autogen: Rename variables read from info file 2017-02-19 12:35:42 +01:00
Sebastian Holtermann
2f3ecd4ea9 Autogen: Inline settings string generation methods 2017-02-19 12:35:42 +01:00
Sebastian Holtermann
739592c925 Autogen: Rename settings string variables 2017-02-19 12:35:42 +01:00
Sebastian Holtermann
ad1f21313f Autogen: Make methods const 2017-02-19 12:35:42 +01:00
Sebastian Holtermann
2296a2e9ee cmFilePathChecksum: Make methods const useable 2017-02-19 12:35:42 +01:00