summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* CMake Nightly Date StampKitware Robot2018-05-161-1/+1
|
* Merge topic 'autogen_register_info_files'Brad King2018-05-151-0/+3
|\ | | | | | | | | | | | | e461a136c1 Autogen: Register generated dependency files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2071
| * Autogen: Register generated dependency filesSebastian Holtermann2018-05-141-0/+3
| | | | | | | | | | | | For CMP0058 record that rcc info files are generated by CMake. Fixes: #17985
* | Merge topic 'custom-command-expand-empty'Brad King2018-05-151-0/+8
|\ \ | | | | | | | | | | | | | | | | | | 6e59491659 add_custom_{command,target}: Fix crash on empty expanded command Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2074
| * | add_custom_{command,target}: Fix crash on empty expanded commandBrad King2018-05-141-0/+8
| |/ | | | | | | | | | | | | | | | | | | | | Our custom command generation logic assumes that all command lines have at least `argv0`. In `add_custom_{command,target}` we already check that at least a `COMMAND` was given, but using `COMMAND_EXPAND_LISTS` in combination with a generator expression that expands to an empty string may produce an empty command line. In this case simply add an empty string as a command to maintain our internal invariant. Fixes: #17993
* | CMake Nightly Date StampKitware Robot2018-05-151-1/+1
| |
* | Merge topic 'cuda-vs-cuda-device-runtime'Brad King2018-05-141-0/+2
|\ \ | | | | | | | | | | | | | | | | | | a170a59a58 VS: Link CUDA binaries with the device runtime library 'cudadevrt' Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2062
| * | VS: Link CUDA binaries with the device runtime library 'cudadevrt'Brad King2018-05-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to https://docs.nvidia.com/cuda/nvrtc/index.html there are some cases where a CUDA binary "...must be linked against the CUDA device runtime (cudadevrt) library". When `nvcc` drives linking it automatically links to runtime libraries as follows: * -cudart=none: None * -cudart=shared: -lcudadevrt -lcudart * -cudart=static: -lcudadevrt -lcudart_static The `cudadevrt` library is the cuda device runtime library. It is always static so passing it to the linker when not necessary does not hurt anything. With Ninja and Makefile generators, we detect `cudadevrt` and either `cudart` or `cudart_static` libraries implied by `nvcc` and then add them to link lines driven by a host compiler. However, this does not work with the VS generator because the CUDA Toolkit Visual Studio integration does not use `nvcc` to link binaries and instead uses `link.exe` directly. Visual Studio project files (`.vcxproj`) for CUDA are expected to explicitly list the needed runtime libraries. Our VS generator already adds `cudart.lib` or `cudart_static.lib` based on the `-cudart=` flag. Update it to also add `cudadevrt.lib` as nvcc does. Fixes: #17988
* | | Merge topic 'update-kwsys'Brad King2018-05-144-15/+30
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 05d67d2545 Merge branch 'upstream-KWSys' into update-kwsys 55efd14733 KWSys 2018-05-11 (46da6b14) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2064
| * | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2018-05-114-15/+30
| | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2018-05-11 (46da6b14)
* | | | Merge topic 'xml-element-enhance'Brad King2018-05-143-61/+57
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ff13b0cdc2 cmCTestLaunch: use cmXMLElement for XML generation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2057
| * | | | cmCTestLaunch: use cmXMLElement for XML generationVitaly Stakhovsky2018-05-113-61/+57
| | | | | | | | | | | | | | | | | | | | class `cmXMLElement` enhanced with more members; its use demonstrated
* | | | | Merge topic 'cpack-nuget'Brad King2018-05-144-0/+183
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f739752ad6 CPack: Add NuGet support dd43e6fe89 Tests: Format `RunCPackVerifyResult.cmake` more consistently 43582cda57 Tests: Fix comment for finding dpkg tool Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1972
| * | | | | CPack: Add NuGet supportAlex Turbov2018-05-114-0/+183
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | CMake Nightly Date StampKitware Robot2018-05-141-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2018-05-131-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2018-05-121-1/+1
| |/ / / |/| | |
* | | | Merge topic 'vs-refactor'Brad King2018-05-112-110/+92
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a2b5acec3b cmVisualStudio10TargetGenerator: refactor Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2054
| * | | | cmVisualStudio10TargetGenerator: refactorVitaly Stakhovsky2018-05-092-110/+92
| |/ / / | | | | | | | | | | | | `WritePlatformConfigTag` moved to local `Elem` class; other improvements
* | | | Merge topic 'vs-fix-csharp-recompile'Brad King2018-05-111-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 91754b4e60 VS: When not referencing output assembly do not try to copy it either Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2037
| * | | | VS: When not referencing output assembly do not try to copy it eitherAndreas Schönle2018-05-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When generating a `ProjectReference` with `ReferenceOutputAssembly` set to `false`, also set `CopyToOutputDirectory` to `Never`. Otherwise MSBuild might report a diagnostic like Project '<name>' is not up to date. CopyLocal reference '...\ZERO_CHECK' is missing from output location. and rebuild the referencing project unnecessarily.
* | | | | Merge topic 'restore-imported-lib-alias-diagnostic'Brad King2018-05-111-0/+8
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | e567d7eb63 add_library: Restore error on alias of non-global imported target Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2058
| * | | | add_library: Restore error on alias of non-global imported targetBrad King2018-05-101-0/+8
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.11.0-rc1~433^2~1 (Add support for IMPORTED GLOBAL targets to be aliased, 2017-09-14) we accidentally dropped the error on calling `add_library` to alias an imported target that is not globally visible. The `add_executable` command's equivalent check was properly updated. Restore the check in `add_library` with the same update. Also fix the test case accordingly. Fixes: #17982
* | | | CMake Nightly Date StampKitware Robot2018-05-111-1/+1
| | | |
* | | | Merge topic 'ctest-start-args-rework'Craig Scott2018-05-103-35/+105
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9deaf07597 Help: add release notes for ctest_start() changes 563781099f ctest_start: read model from TAG file Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2036
| * | | | ctest_start: read model from TAG fileKyle Edwards2018-05-093-35/+105
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | This change reworks ctest_start() so that simply calling ctest_start(APPEND) will read all the information from the TAG file. On top of that, it relaxes the argument parsing for ctest_start() to allow greater flexibility in the argument ordering, and the documentation for ctest_start() has been cleaned up.
* | | | CMake Nightly Date StampKitware Robot2018-05-101-1/+1
|/ / /
* | | 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 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-082-14/+30
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-071-0/+8
| | | | | |
| * | | | | cmGeneratorTarget: make GetManagedType() return 'Native' for static targetsMichael Stürmer2018-05-071-3/+5
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2018-05-081-1/+1
| |_|_|_|/ |/| | | |
* | | | | Merge topic 'doc-command-synopsis'Brad King2018-05-072-11/+59
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | cmRST: Parse inline links and inline literalsBrad King2018-05-072-11/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | |
* | | | | | 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-041-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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-041-1/+1
| | | | | | | | | | | | | | | | | | | | This was accidentally left out of commit 8acf46caf1 (Utilities/Sphinx: Add role and directive for 'envvar' in CMake domain, 2018-04-19).
generated by cgit v0.12 at 2025-02-04 01:53:29 (GMT)