summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'wix-disabled-components'Brad King2016-08-013-1/+19
|\ | | | | | | | | | | ad453f05 CPackWIX: Support CPACK_COMPONENT_<compName>_DISABLED 6f108f84 CPackComponent: Document the *_HIDDEN and *_DISABLED variables
| * CPackWIX: Support CPACK_COMPONENT_<compName>_DISABLEDMichael Stürmer2016-07-222-0/+10
| | | | | | | | Reviewed-by: Nils Gladitz <nilsgladitz@gmail.com>
| * CPackComponent: Document the *_HIDDEN and *_DISABLED variablesNils Gladitz2016-07-221-1/+9
| |
* | Merge topic 'use-string-append'Brad King2016-08-01105-348/+348
|\ \ | | | | | | | | | | | | | | | 7a649111 Use string(APPEND) in Tests 5d0d980d Use string(APPEND) in Modules
| * | Use string(APPEND) in TestsDaniel Pfeifer2016-07-2747-108/+108
| | | | | | | | | | | | | | | | | | | | | 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'
| * | Use string(APPEND) in ModulesDaniel Pfeifer2016-07-2758-240/+240
| | | | | | | | | | | | | | | | | | | | | 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'
* | | Merge topic 'more-virtual-override'Brad King2016-08-016-23/+23
|\ \ \ | | | | | | | | | | | | | | | | 624b7215 Source/CPack: Add CM_OVERRIDE on MacOS cmCPackGenerator overrides
| * | | Source/CPack: Add CM_OVERRIDE on MacOS cmCPackGenerator overridesBrad King2016-07-226-23/+23
| | | |
* | | | Merge topic 'app-framework-bundle-extension'Brad King2016-08-018-12/+113
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
| * | | | Add tests for BUNDLE_EXTENSIONGregor Jasny2016-07-223-4/+64
| | | | |
| * | | | Update documentation about bundle extensionsGregor Jasny2016-07-222-3/+9
| | | | |
| * | | | Honor BUNDLE_EXTENSION also for Frameworks (#14742)Gregor Jasny2016-07-222-2/+18
| | | | |
| * | | | Honor BUNDLE_EXTENSION also for App Bundles (#16148)Gregor Jasny2016-07-223-3/+22
| | | | |
* | | | | Merge topic 'aliased-target-properties'Brad King2016-08-012-8/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | ea647533 Do not report ALIASED_TARGET as always set (#15783)
| * | | | | Do not report ALIASED_TARGET as always set (#15783)Gregor Jasny2016-07-162-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cmGetPropertyCommand::StoreResult expects NULL for unset properties. Make ALIASED_TARGET align with that expectation. Additional corrections to the unit tests are necessary because get_property removes variables for unset properties (in contrast to get_target_property which stores a -NOTFOUND value).
* | | | | | CMake Nightly Date StampKitware Robot2016-08-011-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2016-07-311-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2016-07-301-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2016-07-291-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2016-07-281-1/+1
| |_|_|/ / |/| | | |
* | | | | CMake Nightly Date StampKitware Robot2016-07-271-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2016-07-261-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2016-07-251-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2016-07-241-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2016-07-231-1/+1
| | | | |
* | | | | Merge branch 'release'Brad King2016-07-220-0/+0
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | CMake 3.6.1v3.6.1Brad King2016-07-221-1/+1
| | | | |
* | | | | Merge branch 'release'Brad King2016-07-220-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'revert-autogen-subdirs' into releaseBrad King2016-07-2122-377/+45
| |\ \ \ \
| * \ \ \ \ Merge branch 'nsis-protect-uninst-exec' into releaseBrad King2016-07-212-1/+7
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'compat-CPACK_INSTALL_CMAKE_PROJECTS-subdirectory' into releaseBrad King2016-07-191-1/+2
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge topic 'tests-hide-ldd-check-errors'Brad King2016-07-221-1/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d6a6024e Tests: Hide errors from `ldd --help` output check
| * | | | | | | | Tests: Hide errors from `ldd --help` output checkBrad King2016-07-211-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If `--help` is not a valid option then it may print content to stderr, so we need to capture that.
* | | | | | | | | Merge topic 'windows-export-all-fix-objlib'Brad King2016-07-224-1/+16
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 13a6ff31 VS: Fix WINDOWS_EXPORT_ALL_SYMBOLS for object libraries
| * | | | | | | | | VS: Fix WINDOWS_EXPORT_ALL_SYMBOLS for object librariesBrad King2016-07-214-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | | | | Merge topic 'vim-cmake-syntax'Brad King2016-07-221-57/+515
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 500f67e5 Aux: update vim-syntax-highlighting
| * | | | | | | | | | Aux: update vim-syntax-highlightingPatrick Boettcher2016-07-211-57/+515
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | | | | Merge topic 'vs-default-v100'Brad King2016-07-221-0/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 059c230d VS: Explicitly default to v100 toolset in Visual Studio 2010
| * | | | | | | | | | VS: Explicitly default to v100 toolset in Visual Studio 2010Benjamin Ballet2016-07-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise `CMAKE_VS_PLATFORM_TOOLSET` is not set even though the `v100` toolset is chosen.
* | | | | | | | | | | Merge topic 'revert-autogen-subdirs'Brad King2016-07-2222-377/+45
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5e55d87b Autogen: Revert changes to generate moc/rcc in subdirectories
| * | | | | | | | | | Autogen: Revert changes to generate moc/rcc in subdirectoriesBrad King2016-07-2122-377/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert these commits: * v3.6.0-rc1~134^2 Tests: QtAutogen: Same source name in different directories test, 2016-04-13 * v3.6.0-rc1~134^2~1 Autogen: Generate qrc_NAME.cpp files in subdirectories, 2016-04-19 * v3.6.0-rc1~134^2~2 Autogen: Generate not included moc files in subdirectories, 2016-04-19 They regress existing builds that depend on the paths/symbols generated previously. Another approach will be needed to solve the name collision problem they were intended to solve. Leave the error diagnostics for the colliding cases that were added in the same topic as the above commits because they provide a useful early failure in relevant cases. Fixes #16209.
* | | | | | | | | | | Merge topic 'nsis-protect-uninst-exec'Brad King2016-07-222-1/+7
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | / | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | 11768733 NSIS: Quote uninstaller path when executing it in a shell
| * | | | | | | | | NSIS: Quote uninstaller path when executing it in a shellJustin Clift2016-07-212-1/+7
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Protect our `$0` reference in the shell as `"$0"`. Otherwise it works with a space in the path only due to an insecure Windows feature. Prior to this fix, any installer using the option added by commit v2.8.9~234^2 (Added CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL, 2011-06-11) exposes a local privilege escalation vulnerability. Reported-by: Amir Szekely <kichik@gmail.com> Reported-by: Ug_0 Security
* | | | | | | | | CMake Nightly Date StampKitware Robot2016-07-221-1/+1
| |_|_|_|/ / / / |/| | | | | | |
* | | | | | | | Merge topic 'makefile-response-files'Brad King2016-07-214-42/+82
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c7a7c655 Makefile: Avoid link line object list lengths nearing system limits 34ba5c53 Makefile: Factor out response file checks into common helper
| * | | | | | | Makefile: Avoid link line object list lengths nearing system limitsBrad King2016-07-201-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use response files for object file lists that approach the scale of the system `ARG_MAX` limit. Fixes #16206.
| * | | | | | | Makefile: Factor out response file checks into common helperBrad King2016-07-204-42/+43
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Factor CMAKE_<LANG>_USE_RESPONSE_FILE_FOR_{OBJECTS,LIBRARIES} lookup out into a common helper. Use a separate helper for each because more specific logic may be added to each later.
* | | | | | | Merge topic 'vs-alternate-RootNamespace'Brad King2016-07-211-1/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8aa97fba VS: Handle VS_GLOBAL_RootNamespace special case
| * | | | | | | VS: Handle VS_GLOBAL_RootNamespace special caseBenjamin Ballet2016-07-201-1/+3
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Although we provide a `VS_GLOBAL_ROOTNAMESPACE` option to both set the `RootNamespace` value and reference it, some users may try to set `VS_GLOBAL_RootNamespace` to set `RootNamespace` as a variant of the `VS_GLOBAL_<variable>` property. In this case we still need to add the reference to `$(RootNamespace)`.
* | | | | | | Merge topic 'ninja-target-deps'Brad King2016-07-215-2/+97
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1296a0ea Ninja: Fix inter-target order-only dependencies of custom commands
generated by cgit v0.12 at 2025-01-23 09:34:08 (GMT)