summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-08-032-12/+8
| | | | | * upstream-KWSys: KWSys 2016-08-02 (3f55579d)
* Merge topic 'ccmake-vim-navigation'Brad King2016-08-033-15/+26
|\ | | | | | | | | | | | | e34e9c27 ccmake: Add VIM-like bindings for navigation 9a1b6c60 ccmake: Revise documentation for [d] 31b6cf41 ccmake: Fix typo in help (it's -> its)
| * ccmake: Add VIM-like bindings for navigationPaul Seyfert2016-08-023-12/+23
| | | | | | | | | | | | * scroll with j/k * toggle bool with space, enter insert mode with i * bindings not shown at the bottom of the screen, but given in help
| * ccmake: Revise documentation for [d]Paul Seyfert2016-08-021-2/+2
| | | | | | | | | | * list it at the bottom of the screen * different place in help message
| * ccmake: Fix typo in help (it's -> its)Paul Seyfert2016-08-021-1/+1
| |
* | Merge topic 'port-to-sco'Brad King2016-08-031-2/+11
|\ \ | | | | | | | | | | | | | | | 56539d89 SCO_SV: Enable so filename versioning 16a3a735 cmELF: Port to SCO OpenServer 5.0.7/3.2
| * | cmELF: Port to SCO OpenServer 5.0.7/3.2Patrick Welche2016-08-021-2/+11
| |/ | | | | | | | | | | | | | | Take changes used by pkgsrc [1]: * SCO OpenServer 5.0.7/3.2 does not support 64-bit ELF. [1] http://cdn.netbsd.org/pub/pkgsrc/current/pkgsrc/devel/cmake/patches/
* | Merge topic 'update-kwsys'Brad King2016-08-033-12/+29
|\ \ | | | | | | | | | | | | | | | 35995fa6 Merge branch 'upstream-KWSys' into update-kwsys 6bc3073e KWSys 2016-08-01 (560bcdbb)
| * | Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-08-023-12/+29
| |/ | | | | | | | | * upstream-KWSys: KWSys 2016-08-01 (560bcdbb)
* | Merge topic 'wix-root-description'Brad King2016-08-031-1/+8
|\ \ | | | | | | | | | | | | e29bfbf2 CPackWIX: Support custom title and description for the root feature
| * | CPackWIX: Support custom title and description for the root featureMichael Stürmer2016-08-021-1/+8
| |/ | | | | | | | | | | These can now be specified through the WIX generator specific CPack variables CPACK_WIX_ROOT_FEATURE_TITLE and CPACK_WIX_ROOT_FEATURE_DESCRIPTION.
* | CMake Nightly Date StampKitware Robot2016-08-031-1/+1
|/
* CMake Nightly Date StampKitware Robot2016-08-021-1/+1
|
* Merge topic 'wix-disabled-components'Brad King2016-08-011-0/+4
|\ | | | | | | | | | | ad453f05 CPackWIX: Support CPACK_COMPONENT_<compName>_DISABLED 6f108f84 CPackComponent: Document the *_HIDDEN and *_DISABLED variables
| * CPackWIX: Support CPACK_COMPONENT_<compName>_DISABLEDMichael Stürmer2016-07-221-0/+4
| | | | | | | | Reviewed-by: Nils Gladitz <nilsgladitz@gmail.com>
* | 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-013-5/+40
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
| * | | 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-011-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | ea647533 Do not report ALIASED_TARGET as always set (#15783)
| * | | | Do not report ALIASED_TARGET as always set (#15783)Gregor Jasny2016-07-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 topic 'windows-export-all-fix-objlib'Brad King2016-07-221-0/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 13a6ff31 VS: Fix WINDOWS_EXPORT_ALL_SYMBOLS for object libraries
| * | | | VS: Fix WINDOWS_EXPORT_ALL_SYMBOLS for object librariesBrad King2016-07-211-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 '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-223-159/+45
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | 5e55d87b Autogen: Revert changes to generate moc/rcc in subdirectories
| * | | | | Autogen: Revert changes to generate moc/rcc in subdirectoriesBrad King2016-07-213-159/+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.
* | | | | | 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-213-2/+52
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 1296a0ea Ninja: Fix inter-target order-only dependencies of custom commands
| * | | | | Ninja: Fix inter-target order-only dependencies of custom commandsBrad King2016-07-203-2/+52
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Custom command dependencies are followed for each target's source files and add their transitive closure to the corresponding target. This means that when a custom command in one target has a dependency on a custom command in another target, both will appear in the dependent target's sources. For the Makefile, VS IDE, and Xcode generators this is not a problem because each target gets its own independent build system that is evaluated in target dependency order. By the time the dependent target is built the custom command that belongs to one of its dependencies will already have been brought up to date. For the Ninja generator we need to generate a monolithic build system covering all targets so we can have only one copy of a custom command. This means that we need to reconcile the target-level ordering dependencies from its appearance in multiple targets to include only the least-dependent common set. This is done by computing the set intersection of the dependencies of all the targets containing a custom command. However, we previously included only the direct dependencies so any target-level dependency not directly added to all targets into which a custom command propagates was discarded. Fix this by computing the transitive closure of dependencies for each target and then intersecting those sets. That will get the common set of dependencies. Also add a test to cover a case in which the incorrectly dropped target ordering dependencies would fail.
* | | | | Merge topic 'update-kwsys'Brad King2016-07-214-72/+179
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | e9849d35 bootstrap: Add check for ext/stdio_filebuf.h needed by KWSys 51d9e8ae Merge branch 'upstream-KWSys' into update-kwsys 9ef2b2b1 KWSys 2016-07-19 (9d1dbd95)
| * | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-07-204-72/+179
| |/ / / | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2016-07-19 (9d1dbd95)
* | | | CMake Nightly Date StampKitware Robot2016-07-211-1/+1
|/ / /
* | | Merge topic 'update-kwsys'Brad King2016-07-202-28/+19
|\ \ \ | | | | | | | | | | | | | | | | | | | | 788bb146 Merge branch 'upstream-KWSys' into update-kwsys eb7b5087 KWSys 2016-07-18 (19732229)
generated by cgit v0.12 at 2025-01-21 01:51:22 (GMT)