summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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'
* 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
| * | | | | | Ninja: Fix inter-target order-only dependencies of custom commandsBrad King2016-07-205-2/+97
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'bootstrap-msys2'Brad King2016-07-211-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7ec32a00 bootstrap: Add support for MSYS2
| * | | | | | bootstrap: Add support for MSYS2Brad King2016-07-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bootstrapping under MSYS2 is the same as under MSYS/MinGW except that `uname` reports `MSYS...` instead of `MINGW...`.
* | | | | | | Merge topic 'update-kwsys'Brad King2016-07-215-72/+190
|\ \ \ \ \ \ \ | |/ / / / / / | | | | / / / | |_|_|/ / / |/| | | | | | | | | | | | | | | | | 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)
| * | | | | bootstrap: Add check for ext/stdio_filebuf.h needed by KWSysDāvis Mosāns2016-07-201-0/+11
| | | | | |
| * | | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-07-204-72/+179
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2016-07-19 (9d1dbd95)
| | * | | | KWSys 2016-07-19 (9d1dbd95)KWSys Upstream2016-07-204-72/+179
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: http://public.kitware.com/KWSys.git at commit 9d1dbd95835638e4c0fcf74dc8020cd4cd3426c1 (master). Upstream Shortlog ----------------- Dāvis Mosāns (2): d2cdfc6d FStream: Use common base for basic_ifstream and basic_ofstream 9d1dbd95 FStream: Add MinGW support
* | | | | | 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)
| * \ \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-07-192-28/+19
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2016-07-18 (19732229)
| | * | | | KWSys 2016-07-18 (19732229)KWSys Upstream2016-07-192-28/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: http://public.kitware.com/KWSys.git at commit 19732229f798419307782ea7d252b78701911ea3 (master). Upstream Shortlog ----------------- Dāvis Mosāns (1): 19732229 SystemTools: User better GetEnv and HasEnv signatures
* | | | | | Merge topic 'compat-CPACK_INSTALL_CMAKE_PROJECTS-subdirectory'Brad King2016-07-201-1/+2
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | 57534990 CPack: Add compatibility for incorrect CPACK_INSTALL_CMAKE_PROJECTS value
| * | | | | CPack: Add compatibility for incorrect CPACK_INSTALL_CMAKE_PROJECTS valueBrad King2016-07-191-1/+2
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.6.0-rc1~339^2 (CPack: Fix CPACK_INSTALL_CMAKE_PROJECTS SubDirectory (4th) option, 2016-02-18) we now honor the "Directory" option of this variable. Prior to that commit the value was not used so projects may have used a placeholder value like `.` instead of `/`. Treat `.` the same as `/` to restore compatibility with such projects. Fixes #16205.
* | | | | CMake Nightly Date StampKitware Robot2016-07-201-1/+1
| |/ / / |/| | |
* | | | Merge topic 'use-better-KWSys-GetEnv'Brad King2016-07-1924-110/+134
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | b1f87a50 Use better KWSys SystemTools::GetEnv and HasEnv signatures
| * | | | Use better KWSys SystemTools::GetEnv and HasEnv signaturesDāvis Mosāns2016-07-1824-110/+134
| | | | |
* | | | | Merge topic 'update-kwsys'Brad King2016-07-192-71/+166
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | 03407040 Merge branch 'upstream-KWSys' into update-kwsys bbb3216a KWSys 2016-07-15 (f396bf43)
| * | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-07-182-71/+166
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | * upstream-KWSys: KWSys 2016-07-15 (f396bf43)
generated by cgit v0.12 at 2025-01-21 07:43:17 (GMT)