summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cmCTest: Add missing switch case fallthrough markupBrad King2017-07-051-1/+2
| | | | | | Without this, GCC 7 warns. Reported-by: Rolf Eike Beer <eike@sf-mail.de>
* Merge branch 'release-3.9'Brad King2017-07-050-0/+0
|\
| * Merge branch 'autogen-header-skip' into release-3.9Brad King2017-07-051-1/+1
| |\
| * \ Merge branch 'vs-link-guard-cf' into release-3.9Brad King2017-06-302-6/+0
| |\ \
* | \ \ Merge topic 'vs-link-guard-cf'Brad King2017-07-052-6/+0
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 82a5c2c6 VS: Fix support for '/guard:cf' linker flag Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1018
| * | | VS: Fix support for '/guard:cf' linker flagOlender, Sebastian D2017-06-302-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Although `$(VCTargetsPath)/1033/link.xml` for v140 and v141 toolsets contains an entry for `LinkControlFlowGuard`, it does not work when used in a `.vcxproj` file. Drop our link flag table entries for these toolsets so that the flag will be passed via `AdditionalOptions`.
* | | | Merge topic 'autogen-header-skip'Brad King2017-07-051-1/+1
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | 83d8acee Autogen: Check .moc header name against SKIP list Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1017
| * | | Autogen: Check .moc header name against SKIP listSebastian Holtermann2017-06-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | When encountering an #include "FOO.moc" statement where FOO.hpp was chosen over FOO.cpp as the moc source, the FOO.hpp name was not checked against the moc SKIP list.
* | | | CMake Nightly Date StampKitware Robot2017-07-051-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2017-07-041-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2017-07-031-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2017-07-021-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2017-07-011-1/+1
| | | |
* | | | Merge branch 'release-3.9'Brad King2017-06-300-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'FindDoxygen-project-in-subdir' into release-3.9Brad King2017-06-301-5/+5
| |\ \ \
| * \ \ \ Merge branch 'xcode-cross-sdk-object-libraries' into release-3.9Brad King2017-06-302-5/+5
| |\ \ \ \ | | |_|_|/ | |/| | |
* | | | | Merge topic 'server-mode-protocol-version-docs'Brad King2017-06-301-0/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ab533e48 Help: Document server-mode protocol versions more clearly Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1015
| * | | | | Help: Document server-mode protocol versions more clearlyTobias Hunger2017-06-291-0/+8
| | | | | |
* | | | | | Merge topic 'xcode-cross-sdk-object-libraries'Brad King2017-06-302-5/+5
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | c2a6df94 Xcode: Use correct Object Library paths for cross-SDK builds Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1016
| * | | | | Xcode: Use correct Object Library paths for cross-SDK buildsGregor Jasny2017-06-292-5/+5
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When calculating Object Library paths take a look at the `XCODE_EMIT_EFFECTIVE_PLATFORM_NAME` property to enable builds with different SDKs. Otherwise a hard-coded architecture could be chosen. Fixes: #16040
* | | | | Merge topic 'FindDoxygen-project-in-subdir'Brad King2017-06-301-5/+5
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | 97a9a356 FindDoxygen: Use a stable reference to the location of global resources Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1014
| * | | | FindDoxygen: Use a stable reference to the location of global resourcesRobert Dailey2017-06-291-5/+5
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FindDoxygen generates some files based on the version of Doxygen whose content will not vary across a project and are therefore a global resource that can be shared by all calls to `find_package(Doxygen)` and to `doxygen_add_docs`. We currently use `${PROJECT_BINARY_DIR}` to reference their location, but this is not stable because `project()` calls in a subdirectory can change it. Use `${CMAKE_BINARY_DIR}` instead. Reviewed-by: Craig Scott <craig.scott@crascit.com> Fixes: #17022
* | | | CMake Nightly Date StampKitware Robot2017-06-301-1/+1
| | | |
* | | | Merge branch 'release-3.9'Brad King2017-06-290-0/+0
|\ \ \ \ | |/ / /
| * | | Merge branch 'vs-link-debug-flags' into release-3.9Brad King2017-06-288-35/+340
| |\ \ \
| * \ \ \ Merge branch 'curl-haiku' into release-3.9Brad King2017-06-281-0/+2
| |\ \ \ \ | | |_|/ / | |/| | |
* | | | | Merge topic '16961-xctest-scheme'Brad King2017-06-295-30/+84
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fe34a5c8 Xcode: Add XCTest support to schema generator 690cf2c1 Xcode: Prepare schema generator for XCTest ff3498e7 XCTest: Speed up test by only enabling C language 610d2fce XCTest: Use bundle specific generator expressions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1013
| * | | | | Xcode: Add XCTest support to schema generatorGregor Jasny2017-06-283-7/+62
| | | | | | | | | | | | | | | | | | | | | | | | Closes: #16961
| * | | | | Xcode: Prepare schema generator for XCTestGregor Jasny2017-06-282-20/+19
| | | | | | | | | | | | | | | | | | | | | | | | Issue: #16961
| * | | | | XCTest: Speed up test by only enabling C languageGregor Jasny2017-06-281-1/+1
| | | | | |
| * | | | | XCTest: Use bundle specific generator expressionsGregor Jasny2017-06-281-2/+2
| | | | | |
* | | | | | Merge topic 'deb-on-windows'Brad King2017-06-298-28/+92
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 52991413 CPackDeb: Enable the DEB generator on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !979
| * | | | | | CPackDeb: Enable the DEB generator on WindowsNils Gladitz2017-06-288-28/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While some features require external Unix tools the generator is mostly portable. By enabling it on Windows it can be used for cross platform packaging.
* | | | | | | Merge topic 'vs-link-debug-flags'Brad King2017-06-298-35/+340
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | / | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7ba27e36 VS: Add v140 and v141 flag table entries for /DEBUG:NONE and /DEBUG:FULL ae44496e VS: Fix GenerateDebugInformation values for v140 and v141 toolsets 27bef160 VS: Fix GenerateDebugInformation flag map text for v141 toolsets 17a397c2 VS: Split link flag table between v140 and v141 toolsets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1002
| * | | | | VS: Add v140 and v141 flag table entries for /DEBUG:NONE and /DEBUG:FULLIan Hojnicki2017-06-282-0/+11
| | | | | |
| * | | | | VS: Fix GenerateDebugInformation values for v140 and v141 toolsetsBrad King2017-06-285-30/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When VS 2015 was first released, its new v140 toolset came with a `link.xml` file that changed the `GenerateDebugInformation` boolean (`false` and `true`) value from earlier toolsets to an enumeration consisting of the possible values `No`, `Debug`, and `DebugFastLink`. We first adapted to this in commit v3.4.2~2^2 (VS: Fix VS 2015 .vcxproj file value for GenerateDebugInformation, 2016-01-08), but that broke older toolsets that still expected the boolean. Then commit v3.6.0-rc1~295^2~1 (VS: Fix VS 2015 .vcxproj debug setting for older toolsets, 2016-02-24) added a hack to fix up the value based on the toolset in use. Several follow-up commits fixed this for more older toolsets because our flag table was at the time based on the generator in use rather than the toolset in use. Since commit v3.8.0-rc1~396^2 (VS: Choose flag map based on the toolset name, 2016-10-17) we use a flag table based on the toolset, so the fixup hack should not be needed. We had to keep it around only due to our default value for GenerateDebugInformation (`false` or `No`) still being based on the generator instead of the toolset. A VS 2015 update was released that changed the v140 toolset `link.xml` file back to using `false` and `true` for the `GenerateDebugInformation` enumeration variants previously known as `No` and `Debug`. In order to know which pair to use, we need to parse the `link.xml` file for the current toolset. Switch back to using `false` and `true` unconditionally in our `GenerateDebugInformation` flag table entries and default value. With that plus the toolset-based flag table, we now get incorrect values for `GenerateDebugInformation` only when using a v140 toolset from an older VS 2015 installation. Detect this case by parsing `link.xml` and add special logic to convert `false` and `true` to `No` and `Debug` to satisfy the older toolset specification. Inspired-by: Ian Hojnicki <nullref@live.com> Fixes: #17020
| * | | | | VS: Fix GenerateDebugInformation flag map text for v141 toolsetsIan Hojnicki2017-06-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Update the help text to match that from v141's link.xml file.
| * | | | | VS: Split link flag table between v140 and v141 toolsetsIan Hojnicki2017-06-285-6/+291
| | |_|/ / | |/| | |
* | | | | CMake Nightly Date StampKitware Robot2017-06-291-1/+1
| |_|/ / |/| | |
* | | | Merge topic 'clang-cl-no-std'Brad King2017-06-282-29/+61
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c67bb5ba Clang: Do not add '-std=' options when simulating MSVC Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !982
| * | | | Clang: Do not add '-std=' options when simulating MSVCRuben Van Boxem2017-06-272-29/+61
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | The `cl.exe` style command line does not accept the `-std=` options. Instead behave like MSVC where we don't define standard levels. Fixes: #16266
* | | | Merge topic 'feature/include_guard'Brad King2017-06-2828-1/+336
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c96f43b7 include_guard: add tests for the feature 80f1221f include_guard: add doc pages and a release note 85b52a04 include_guard: add vim syntax highlighting rules d44bd1c2 include_guard: implement new command Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Craig Scott <craig.scott@crascit.com> Merge-request: !928
| * | | | include_guard: add tests for the featurePavel Solodovnikov2017-06-2219-0/+126
| | | | |
| * | | | include_guard: add doc pages and a release notePavel Solodovnikov2017-06-223-0/+55
| | | | |
| * | | | include_guard: add vim syntax highlighting rulesPavel Solodovnikov2017-06-221-1/+5
| | | | |
| * | | | include_guard: implement new commandPavel Solodovnikov2017-06-225-0/+150
| | | | |
* | | | | Merge topic 'fix-windows-ninja-solink'Brad King2017-06-281-4/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 58017517 Ninja: Fix generated command lines for cmake_symlink_* on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1003
| * | | | | Ninja: Fix generated command lines for cmake_symlink_* on WindowsNils Gladitz2017-06-231-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake generates multiple commands cojoined with &&. On Windows this only works when executing the commands through the Windows shell.
* | | | | | Merge topic 'curl-haiku'Brad King2017-06-281-0/+2
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | e7936751 curl: Fix build on Haiku Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1006
| * | | | | curl: Fix build on HaikuJérôme Duval2017-06-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Haiku the network functions are in libnetwork, so use it when it exists.
generated by cgit v0.12 at 2025-01-09 18:30:20 (GMT)