Commit Graph

32869 Commits

Author SHA1 Message Date
Brad King b1cd292335 Merge topic 'vim-syntax-updates'
cd7ed47c Aux: highlight commands using Function
bca8be58 Aux: sort the highlighting list
7decbe8f Aux: highlight CMAKE_{CMAKE,CPACK}_COMMAND variables
2b57b139 Aux: highlight modules using Include
8ac4e2cf Aux: highlight conditiona and repeat commands differently
3b3bd880 Aux: highlight deprecated commands as warnings
481f8cf1 Aux: remove unused highlight links
ffa44a39 Aux: highlight Lua-style comments
29eeb9a8 Aux: check spelling in comments
2016-08-01 15:04:37 -04:00
Brad King 5ec03c93fc Merge topic 'wix-disabled-components'
ad453f05 CPackWIX: Support CPACK_COMPONENT_<compName>_DISABLED
6f108f84 CPackComponent: Document the *_HIDDEN and *_DISABLED variables
2016-08-01 14:59:53 -04:00
Brad King 88e1c54a7c Merge topic 'use-string-append'
7a649111 Use string(APPEND) in Tests
5d0d980d Use string(APPEND) in Modules
2016-08-01 14:59:50 -04:00
Brad King bfac78d074 Merge topic 'more-virtual-override'
624b7215 Source/CPack: Add CM_OVERRIDE on MacOS cmCPackGenerator overrides
2016-08-01 14:59:47 -04:00
Brad King 2711c35a8d Merge topic 'app-framework-bundle-extension'
f951d0ad Add tests for BUNDLE_EXTENSION
c63380b1 Update documentation about bundle extensions
134d5c1f Honor BUNDLE_EXTENSION also for Frameworks (#14742)
2b909c08 Honor BUNDLE_EXTENSION also for App Bundles (#16148)
2016-08-01 14:59:44 -04:00
Brad King 8427b8e11c Merge topic 'aliased-target-properties'
ea647533 Do not report ALIASED_TARGET as always set (#15783)
2016-08-01 14:59:41 -04:00
Kitware Robot 8b9cd61337 CMake Nightly Date Stamp 2016-08-01 00:01:03 -04:00
Kitware Robot 963c4e4b90 CMake Nightly Date Stamp 2016-07-31 00:01:03 -04:00
Kitware Robot 99f5a32c7a CMake Nightly Date Stamp 2016-07-30 00:01:02 -04:00
Kitware Robot db713223a8 CMake Nightly Date Stamp 2016-07-29 00:01:03 -04:00
Kitware Robot 09a86b392e CMake Nightly Date Stamp 2016-07-28 00:01:04 -04:00
Daniel Pfeifer 7a649111cd Use string(APPEND) in Tests
Automate with:

find Tests -type f -print0 | xargs -0 perl -i -0pe \
's/set\(([a-zA-Z0-9_]+)(\s+)"\$\{\1\}([^"])/string(APPEND \1\2"\3/g'
2016-07-28 00:43:04 +02:00
Daniel Pfeifer 5d0d980d99 Use string(APPEND) in Modules
Automate with:

find Modules -type f -print0 | xargs -0 perl -i -0pe \
's/set\(([a-zA-Z0-9_]+)(\s+)"\$\{\1\}([^"])/string(APPEND \1\2"\3/g'
2016-07-28 00:41:13 +02:00
Kitware Robot 73c618be70 CMake Nightly Date Stamp 2016-07-27 00:01:03 -04:00
Jostein Kjønigsen ca684ccb46 cmake-mode.el: Fix byte-compilation warnings. 2016-07-26 14:41:02 +02:00
Kitware Robot 8f884f2146 CMake Nightly Date Stamp 2016-07-26 00:01:02 -04:00
Kitware Robot 3d57541d6d CMake Nightly Date Stamp 2016-07-25 00:01:07 -04:00
Kitware Robot ffc7c24b2e CMake Nightly Date Stamp 2016-07-24 00:01:03 -04:00
Kitware Robot d615d20a63 CMake Nightly Date Stamp 2016-07-23 00:01:04 -04:00
Ben Boeckel cd7ed47c4a Aux: highlight commands using Function
These are closer to functions than anything else. Also change the other
groups which were highlighted with Function to other groups.
2016-07-22 12:33:23 -04:00
Ben Boeckel bca8be583e Aux: sort the highlighting list 2016-07-22 12:32:40 -04:00
Ben Boeckel 7decbe8ffb Aux: highlight CMAKE_{CMAKE,CPACK}_COMMAND variables 2016-07-22 12:32:05 -04:00
Ben Boeckel 2b57b13920 Aux: highlight modules using Include
They are closer to Include than generic preprocessor lines.
2016-07-22 12:31:26 -04:00
Ben Boeckel 8ac4e2cfa2 Aux: highlight conditiona and repeat commands differently 2016-07-22 12:30:57 -04:00
Ben Boeckel 3b3bd880a3 Aux: highlight deprecated commands as warnings 2016-07-22 12:30:44 -04:00
Ben Boeckel 481f8cf1cc Aux: remove unused highlight links 2016-07-22 12:24:23 -04:00
Ben Boeckel ffa44a39c9 Aux: highlight Lua-style comments 2016-07-22 12:23:53 -04:00
Ben Boeckel 29eeb9a8fd Aux: check spelling in comments 2016-07-22 12:23:16 -04:00
Brad King 624b72159b Source/CPack: Add CM_OVERRIDE on MacOS cmCPackGenerator overrides 2016-07-22 10:42:37 -04:00
Brad King 8842a501cf Merge branch 'release' 2016-07-22 10:34:05 -04:00
Brad King f59513140b CMake 3.6.1 2016-07-22 09:26:11 -04:00
Brad King 4e88b1ec17 Merge branch 'release' 2016-07-22 09:22:53 -04:00
Brad King d504999d86 Merge topic 'tests-hide-ldd-check-errors'
d6a6024e Tests: Hide errors from `ldd --help` output check
2016-07-22 09:17:53 -04:00
Brad King 1fc340f0d4 Merge topic 'windows-export-all-fix-objlib'
13a6ff31 VS: Fix WINDOWS_EXPORT_ALL_SYMBOLS for object libraries
2016-07-22 09:17:48 -04:00
Brad King 3e7689ec39 Merge topic 'vim-cmake-syntax'
500f67e5 Aux: update vim-syntax-highlighting
2016-07-22 09:17:41 -04:00
Brad King 4c61e40cc5 Merge topic 'vs-default-v100'
059c230d VS: Explicitly default to v100 toolset in Visual Studio 2010
2016-07-22 09:17:36 -04:00
Brad King 19ccd35473 Merge topic 'revert-autogen-subdirs'
5e55d87b Autogen: Revert changes to generate moc/rcc in subdirectories
2016-07-22 09:17:28 -04:00
Brad King e09518ca50 Merge topic 'nsis-protect-uninst-exec'
11768733 NSIS: Quote uninstaller path when executing it in a shell
2016-07-22 09:17:19 -04:00
Michael Stürmer ad453f0502 CPackWIX: Support CPACK_COMPONENT_<compName>_DISABLED
Reviewed-by: Nils Gladitz <nilsgladitz@gmail.com>
2016-07-22 08:49:29 +02:00
Nils Gladitz 6f108f84d0 CPackComponent: Document the *_HIDDEN and *_DISABLED variables 2016-07-22 08:41:22 +02:00
Gregor Jasny f951d0adb4 Add tests for BUNDLE_EXTENSION 2016-07-21 23:18:56 -07:00
Gregor Jasny c63380b195 Update documentation about bundle extensions 2016-07-21 23:16:50 -07:00
Gregor Jasny 134d5c1f7c Honor BUNDLE_EXTENSION also for Frameworks (#14742) 2016-07-21 23:16:50 -07:00
Gregor Jasny 2b909c08f5 Honor BUNDLE_EXTENSION also for App Bundles (#16148) 2016-07-21 23:16:50 -07:00
Kitware Robot 7bfbcc75a3 CMake Nightly Date Stamp 2016-07-22 00:01:03 -04:00
Brad King d6a6024e9e Tests: Hide errors from `ldd --help` output check
If `--help` is not a valid option then it may print content to stderr,
so we need to capture that.
2016-07-21 15:39:05 -04:00
Brad King dbc0ec1648 Merge topic 'makefile-response-files'
c7a7c655 Makefile: Avoid link line object list lengths nearing system limits
34ba5c53 Makefile: Factor out response file checks into common helper
2016-07-21 11:27:31 -04:00
Benjamin Ballet 059c230d89 VS: Explicitly default to v100 toolset in Visual Studio 2010
Otherwise `CMAKE_VS_PLATFORM_TOOLSET` is not set even though the `v100`
toolset is chosen.
2016-07-21 11:13:16 -04:00
Brad King 13a6ff31be VS: Fix WINDOWS_EXPORT_ALL_SYMBOLS for object libraries
Teach Visual Studio generators to include object files from object
libraries in the list of objects whose symbols are to be exported.
The Makefile and Ninja generators already did this.  Update the
test to cover this case.

Reported-by: Bertrand Bellenot <Bertrand.Bellenot@cern.ch>
2016-07-21 11:05:22 -04:00
Patrick Boettcher 500f67e546 Aux: update vim-syntax-highlighting
This commit updates the vim-syntax-file. It is still not complete, but contains much more keywords,
built-in variables. Generator expressions are highlighted as well.

This file is generated from a script which parses the --help
output of cmake 3.5.

Imported from here: https://github.com/pboettch/vim-cmake-syntax

Signed-off-by: Patrick Boettcher <patrick.boettcher@posteo.de>
2016-07-21 16:48:55 +02:00