summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CPack: Add NuGet supportAlex Turbov2018-05-1116-6/+835
| | | | | | | | | | | | | | | | | | | | | | | | | | | Create a CPack generator that uses `nuget.exe` to create packages: https://docs.microsoft.com/en-us/nuget/what-is-nuget NuGet packages could be easily produced from a `*.nuspec` file (running `nuget pack` in the directory w/ the spec file). The spec filename does not affect the result `*.nupkg` name -- only `id` and `version` elements of the spec are used (by NuGet). Some implementation details: * Minimize C++ code -- use CMake script do to the job. It just let the base class (`cmCPackGenerator`) to preinstall everything to a temp directory, render the spec file and run `nuget pack` in it, harvesting `*.nupkg` files...; * Ignore package name (and use default paths) prepared by the base class (only `CPACK_TEMPORARY_DIRECTORY` is important) -- final package filename is a responsibility of NuGet, so after generation just scan the temp directory for the result `*.nupkg` file(s) and update `packageFileNames` data-member of the generator; * The generator supports _all-in-one_ (default), _one-group-per-package_ and _one-component-per-package_ modes.
* Tests: Format `RunCPackVerifyResult.cmake` more consistentlyAlex Turbov2018-05-091-24/+24
|
* Tests: Fix comment for finding dpkg toolAlex Turbov2018-05-091-2/+1
|
* Merge topic 'doc-cpack-revise'Brad King2018-05-091-330/+339
|\ | | | | | | | | | | | | | | | | | | bfb91ff7f2 CPack: Add more markup to module documentation 5fc59ea7c8 CPack: Document `CPACK_PACKAGE_DESCRIPTION` variable 3f354d65b4 CPack: Move CPACK_BINARY_<GENNAME> with rest of docs 53ec402069 CPack: Convert documentation to long-bracket comment syntax Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2051
| * CPack: Add more markup to module documentationAlex Turbov2018-05-081-174/+174
| | | | | | | | Also indent variable docs consistently.
| * CPack: Document `CPACK_PACKAGE_DESCRIPTION` variableAlex Turbov2018-05-081-3/+11
| |
| * CPack: Move CPACK_BINARY_<GENNAME> with rest of docsAlex Turbov2018-05-081-10/+10
| |
| * CPack: Convert documentation to long-bracket comment syntaxAlex Turbov2018-05-081-320/+321
| | | | | | | | Use `#[===...==[.rst:` comments for docs.
* | Merge topic 'vs-refactor-xml'Brad King2018-05-091-1/+2
|\ \ | | | | | | | | | | | | | | | | | | 0bd1d1fcc4 VS: Fix regression in XML generation for CUDA Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2053
| * | VS: Fix regression in XML generation for CUDABrad King2018-05-081-1/+2
| | | | | | | | | | | | | | | | | | Refactoring in commit 3f315dc128 (cmVisualStudio10TargetGenerator: XML refactoring, 2018-05-02) accidentally left the `<Import>` element for the CUDA build customizations unclosed.
* | | CMake Nightly Date StampKitware Robot2018-05-091-1/+1
| | |
* | | Merge branch 'release-3.11'Brad King2018-05-080-0/+0
|\ \ \
| * \ \ Merge branch 'FindCUDA-revert-sepcomp-cublas' into release-3.11Brad King2018-05-081-2/+2
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !2048
| * \ \ \ Merge branch 'doc-updates' into release-3.11Brad King2018-05-082-3/+11
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !2043
| * \ \ \ \ Merge branch 'java-new-packaging-fixes' into release-3.11Brad King2018-05-082-3/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !2042
* | \ \ \ \ \ Merge topic 'pkgconf-imp-target-lib-path'Brad King2018-05-081-2/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ac5731a7e3 FindPkgConfig: correct library search path for imported targets. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2027
| * | | | | | | FindPkgConfig: correct library search path for imported targets.Aleksandr Mezin2018-05-011-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `-L` in LDFLAGS doesn't mean that standard search paths should be excluded. Example: $ pkg-config --libs libmutter-2 -L/usr/lib/mutter -lmutter-2 -lgtk-3 -lgdk-3 -lmutter-clutter-2 -lcairo-gobject -latk-1.0 -lpangocairo-1.0 -lpango-1.0 -lfribidi -ljson-glib-1.0 -lgio-2.0 -lwayland-egl -lwayland-client -lXtst -lXi -lmutter-cogl-2 -lcairo -lgmodule-2.0 -pthread -lgdk_pixbuf-2.0 -lgobject-2.0 -lglib-2.0 -lgbm -ldrm -lwayland-server -lEGL -lXext -lXdamage -lXfixes -lXcomposite -lXrandr -lX11 Most of these libraries are located at standard paths, not in `/usr/lib/mutter`. Fixes: #17954
* | | | | | | | 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.