summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'vs-improve-options'Brad King2018-05-082-124/+99
|\ | | | | | | | | | | | | e76a0c6071 VS: improve options generation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2044
| * VS: improve options generationVitaly Stakhovsky2018-05-052-124/+99
| | | | | | | | Make use of the `Elem` and `OptionsHelper` classes; some cleanup
* | Merge topic 'deprecate_static_managed_targets'Brad King2018-05-084-14/+41
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b7c2b2cd78 cmVisualStudio10TargetGenerator: add handling of static C# targets d244f2cad3 cmVisualStudio10TargetGenerator: add handling of manual /clr setting 1e5a8f882f cmVisualStudio10TargetGenerator: fix checking for managed target 8d7ffed048 cmVisualStudio10TargetGenerator: issue warning when adding static C# lib 73ee599a82 cmGeneratorTarget: make GetManagedType() return 'Native' for static targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2014
| * | cmVisualStudio10TargetGenerator: add handling of static C# targetsMichael Stürmer2018-05-071-0/+5
| | |
| * | cmVisualStudio10TargetGenerator: add handling of manual /clr settingMichael Stürmer2018-05-071-0/+10
| | |
| * | cmVisualStudio10TargetGenerator: fix checking for managed targetMichael Stürmer2018-05-071-12/+3
| | |
| * | cmVisualStudio10TargetGenerator: issue warning when adding static C# libMichael Stürmer2018-05-073-0/+19
| | |
| * | cmGeneratorTarget: make GetManagedType() return 'Native' for static targetsMichael Stürmer2018-05-071-3/+5
| | |
* | | Merge topic 'update-libuv'Brad King2018-05-0861-752/+991
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0d389d175a libuv: Revert local linux/sparc64 fix now that we have upstream fix 42fbb28516 Merge branch 'upstream-libuv' into update-libuv c8b67ea119 libuv 2018-05-06 (bf605bd7) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2049
| * | | libuv: Revert local linux/sparc64 fix now that we have upstream fixBrad King2018-05-071-1/+1
| | | |
| * | | Merge branch 'upstream-libuv' into update-libuvBrad King2018-05-0761-751/+990
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * upstream-libuv: libuv 2018-05-06 (bf605bd7)
| | * | | libuv 2018-05-06 (bf605bd7)libuv upstream2018-05-0761-751/+990
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/libuv/libuv.git at commit bf605bd7d0dd5660663e8e2eb44d63aa3355e268 (v1.x).
* | | | | Merge topic 'doc-code-block-highlight'Brad King2018-05-081-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8114b00b02 Utilities/Sphinx: Do not highlight unspecified code blocks as python Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2047
| * | | | | Utilities/Sphinx: Do not highlight unspecified code blocks as pythonBrad King2018-05-041-0/+1
| | | | | |
* | | | | | Merge topic 'FindCUDA-revert-sepcomp-cublas'Brad King2018-05-081-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9a66345752 FindCUDA: Fix regression in separable compilation without cublas Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2048
| * | | | | | FindCUDA: Fix regression in separable compilation without cublasBrad King2018-05-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit v3.11.0-rc1~274^2 (FindCUDA: Add cublas device library to separable compilation, 2017-11-03). It breaks targets that do not link to cublas. Another solution will be needed to solve the original problem in a more compatible way. Fixes: #17965
* | | | | | | Merge topic 'doc-updates'Brad King2018-05-082-3/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e15adbfed3 Help: Specify COMPILE_OPTIONS and COMPILE_FLAGS source properties usage Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2043
| * | | | | | | Help: Specify COMPILE_OPTIONS and COMPILE_FLAGS source properties usageMarc Chevrier2018-05-072-3/+11
| |/ / / / / /
* | | | | | | Merge topic 'java-new-packaging-fixes'Brad King2018-05-082-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b4e1569315 FindJava, FindJNI: fix erroneous regex, enhance registry lookup Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2042
| * | | | | | | FindJava, FindJNI: fix erroneous regex, enhance registry lookupMarc Chevrier2018-05-072-3/+3
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2018-05-081-1/+1
| |_|_|/ / / / |/| | | | | |
* | | | | | | Merge topic 'doc-command-synopsis'Brad King2018-05-079-242/+400
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 72814e46da Utilities/Sphinx: Make HTML links in parsed-literal blocks more obvious 08b4ea639c Help: Organize file command docs into sections 51c0e1407c Help: Add Synopsis section to install, list, and string docs 0acd705119 Help: Improve list command signature group name for read operations d5b2745b34 Help: Re-order file command docs 7d918b3cee cmRST: Parse inline links and inline literals Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2039
| * | | | | | | Utilities/Sphinx: Make HTML links in parsed-literal blocks more obviousBrad King2018-05-071-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hyperlink text color does not stand out when used inside a literal block because such blocks typically get syntax highlighting. Update our CSS style to make the links more distinct. Suggested-by: Kyle Edwards <kyle.edwards@kitware.com>
| * | | | | | | Help: Organize file command docs into sectionsBrad King2018-05-071-16/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a synopsis section at the top summarizing all signatures. Issue: #17948
| * | | | | | | Help: Add Synopsis section to install, list, and string docsBrad King2018-05-073-99/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Summarize the command signatures in one block at the top of the documentation as is typical in Unix command-line tool manuals. Make the mode keywords links to the corresponding full signature and documentation. Issue: #17948
| * | | | | | | Help: Improve list command signature group name for read operationsBrad King2018-05-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The LENGTH, GET, JOIN, and SUBLIST operations all read the list without modifying it. Name their section appropriately.
| * | | | | | | Help: Re-order file command docsBrad King2018-05-071-125/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prepare for the addition of section headers for grouping commands.
| * | | | | | | cmRST: Parse inline links and inline literalsBrad King2018-05-074-11/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Render links as the link text only. Render literals as themselves. This is closer to what the Sphinx text generator does.
* | | | | | | | Merge topic 'vs-cert'Brad King2018-05-072-4/+9
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5cc195f1f4 VS Generator: Only include default certificate if it was actually copied Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2034
| * | | | | | | VS Generator: Only include default certificate if it was actually copiedMark Ingram2018-05-042-4/+9
| | |_|_|/ / / | |/| | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2018-05-071-1/+1
| | | | | | |
* | | | | | | Merge topic 'cpack_module_indentation_fix'Craig Scott2018-05-061-17/+17
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a01c6e9921 CPack: Fix indentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2041
| * | | | | | | CPack: Fix indentationCraig Scott2018-05-041-17/+17
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Addresses indentation not matching guidelines, missed in !2020. No functional changes and no changes to docs.
* | | | | | | CMake Nightly Date StampKitware Robot2018-05-061-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2018-05-051-1/+1
|/ / / / /
* | | | | Merge topic 'vs-refactor-xml'Brad King2018-05-042-843/+788
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | 3f315dc128 cmVisualStudio10TargetGenerator: XML refactoring Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2028
| * | | | cmVisualStudio10TargetGenerator: XML refactoringVitaly Stakhovsky2018-05-042-843/+788
| | | | |
* | | | | Merge topic 'doc-xref-envvar'Brad King2018-05-043-1/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 828e18bb3e cmRST: Add support for 'envvar' cmake domain role Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2038
| * | | | | cmRST: Add support for 'envvar' cmake domain roleBrad King2018-05-043-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was accidentally left out of commit 8acf46caf1 (Utilities/Sphinx: Add role and directive for 'envvar' in CMake domain, 2018-04-19).
* | | | | | Merge topic 'test-CheckSourceTree-in-source'Brad King2018-05-041-3/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 46fa1af514 Tests: Fix CheckSourceTree for in-source non-dashboard builds Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2025
| * | | | | | Tests: Fix CheckSourceTree for in-source non-dashboard buildsIsrael Blancas2018-05-031-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For in-source builds we must tolerate non-tracked files in the source tree. Previously we only tolerated them for dashboard builds during automated testing, but we should tolerate them for local user builds too. Fixes: #17868
* | | | | | | Merge topic 'genex-complang-not-loaded'Brad King2018-05-044-19/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4f82199bef Genex: Allow COMPILE_LANGUAGE to name a language that is not loaded Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2031
| * | | | | | | Genex: Allow COMPILE_LANGUAGE to name a language that is not loadedHenry Schreiner2018-05-034-19/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Evaluate to false on `$<COMPILE_LANGUAGE:Lang>` if language `Lang` is not loaded. This is helpful in exported targets consumed in other projects that may not enable all the same languages. Fixes: #17952
* | | | | | | | CMake Nightly Date StampKitware Robot2018-05-041-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'feature/cpack-default-package-version'Craig Scott2018-05-0315-34/+223
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | af1c48871c CPack: Use project version as default for `CPACK_PACKAGE_VERSION` Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Harry Mallon <hjmallon@gmail.com> Merge-request: !2020
| * | | | | | | CPack: Use project version as default for `CPACK_PACKAGE_VERSION`Alex Turbov2018-05-0215-34/+223
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Introduce `CMAKE_PROJECT_VERSION` and the corresponsing components: `CMAKE_PROJECT_VERSION_MAJOR`, `CMAKE_PROJECT_VERSION_MINOR`, `CMAKE_PROJECT_VERSION_PATCH` and `CMAKE_PROJECT_VERSION_TWEAK`. * `CPack` module use `CMAKE_PROJECT_VERSION_MAJOR`, `CMAKE_PROJECT_VERSION_MINOR` and `CMAKE_PROJECT_VERSION_PATCH` to initialize corresponsing CPack variables.
* | | | | | | | Merge branch 'release-3.11'Brad King2018-05-030-0/+0
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'ctest-libuv-linux-sparc64' into release-3.11Brad King2018-05-021-1/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2029
* | \ \ \ \ \ \ \ \ Merge topic 'ctest-libuv-linux-sparc64'Brad King2018-05-031-1/+1
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1c22fdf360 libuv: linux/sparc64: use fcntl to set and clear O_NONBLOCK Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2029
| * | | | | | | | | libuv: linux/sparc64: use fcntl to set and clear O_NONBLOCKBrad King2018-05-021-1/+1
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upstream libuv commits: * node-v0.6.0~28 (linux: use ioctl(FIONBIO) to set O_NONBLOCK, saves a syscall, 2011-10-29) * v1.11.0~11 (unix: use async-signal safe functions between fork and exec, 2016-12-12) left an asymmetry in the way O_NONBLOCK is set and cleared. Normally ioctl/FIONBIO is used for both. However, uv_spawn uses fcntl/O_NONBLOCK to clear O_NONBLOCK between fork and exec. This fails on Linux/sparc64 where setting via ioctl/FIONBIO actually sets two bits (in O_NDELAY) that cause clearing via fcntl/O_NONBLOCK to be silently ignored (though clearing via ioctl/FIONBIO or fcntl/O_NDELAY works). Since CMake commit v3.11.0-rc1~117^2 (CTest: Re-implement test process handling using libuv, 2017-12-10), CTest uses libuv. On Linux/sparc64 child processes have been started with non-blocking output pipes. This can lead to write errors or lost output from children not prepared to deal with `EAGAIN` on stdout or stderr. Fix this for now by switching libuv back to fcntl/O_NONBLOCK to set and clear O_NONBLOCK when compiled on Linux/sparc64. LibUV-Issue: 1830 Fixes: #17941