summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* 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
* 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).
* | | Merge topic 'genex-complang-not-loaded'Brad King2018-05-041-9/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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-031-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-032-24/+33
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | 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-022-24/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 topic 'namelink-component'Brad King2018-05-033-7/+62
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7e8046e20b Help: add release notes for NAMELINK_COMPONENT c02eeb0853 Help: clarify "undefined behavior" in install(EXPORT) command edcb545a24 install: add test for new NAMELINK_COMPONENT parameter 0212d7c762 install: add NAMELINK_COMPONENT argument cbb609072f Help: clean up install(TARGETS) documentation b81280ba1f Help: add list of command signatures to top of INSTALL page Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Alex Turbov <i.zaufi@gmail.com> Merge-request: !1982
| * | | | install: add NAMELINK_COMPONENT argumentKyle Edwards2018-05-033-7/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For shared libraries, this allows you to specify separate components for the shared library and for the namelink. Suggested in https://cmake.org/pipermail/cmake-developers/2014-December/024032.html.
* | | | | CMake Nightly Date StampKitware Robot2018-05-031-1/+1
| |_|/ / |/| | |
* | | | Merge topic 'code-improvements'Brad King2018-05-023-47/+45
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0c47ed6430 cmMakefile: Convert private helpers to file static functions e13fa223fc cmMakefile: Improve ExpandVariablesInString return type b542e0c74f cmCPluginAPI: Remove a few unnecessary c_str() calls Acked-by: Kitware Robot <kwrobot@kitware.com> Rejected-by: Marc Chevrier <marc.chevrier@gmail.com> Merge-request: !2018
| * | | cmMakefile: Convert private helpers to file static functionsVitaly Stakhovsky2018-05-012-33/+30
| | | | | | | | | | | | | | | | | | | | | | | | The two-argument forms of `AddDefineFlag` and `RemoveDefineFlag` need no access to `cmMakefile` class members. They are used only within the implementation file.
| * | | cmMakefile: Improve ExpandVariablesInString return typeVitaly Stakhovsky2018-05-013-11/+12
| | | | | | | | | | | | | | | | | | | | Return `std::string const&` instead of a `const char*` that points into a string anyway. Update call sites accordingly.
| * | | cmCPluginAPI: Remove a few unnecessary c_str() callsVitaly Stakhovsky2018-05-011-3/+3
| | | |
* | | | CMake Nightly Date StampKitware Robot2018-05-021-1/+1
| | | |
* | | | Merge topic 'source_group-empty-prefix'Brad King2018-05-011-1/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b3baa97e80 Source_Group: Allow an empty prefix with the TREE syntax. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2022
| * | | | Source_Group: Allow an empty prefix with the TREE syntax.Yohann Benedic2018-04-301-1/+5
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When calling source_group(TREE <root> PREFIX "" FILES ...) the files located at the root directory were not assigned to the correct source group: they were put in a default group (e.g. "Source Files" in Visual Studio). Fixes: #17608
* | | | Merge topic 'doc-wiki-links'Brad King2018-05-011-3/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 052743556b Modules: Update documented links to CMake community Wiki Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2023
| * | | | Modules: Update documented links to CMake community WikiBrad King2018-04-301-3/+1
| | | | | | | | | | | | | | | | | | | | The wiki has moved. Update links to reference the new pages.
* | | | | CMake Nightly Date StampKitware Robot2018-05-011-1/+1
|/ / / /
* | | | Merge topic 'cpack_docs_cleanup'Brad King2018-04-301-9/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9a8687121f Help: Improve accuracy, readability and cross-referencing of cpack docs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2013
| * | | | Help: Improve accuracy, readability and cross-referencing of cpack docsCraig Scott2018-04-271-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is primarily a cleanup of the cpack(1) page. The cpack.cxx file and CPack module were also updated to make the docs relating to the generator specification and option names consistent in all three places.
* | | | | Merge topic 'cxx-checks-tolerate-more-warnings'Brad King2018-04-301-0/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2254b72061 C++ feature checks: Filter out warnings caused by local configuration Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2019
| * | | | | C++ feature checks: Filter out warnings caused by local configurationBrad King2018-04-301-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some environments the linker produces warnings like warning: directory not found for option warning: object file compiled with -mlong-branch ... These do not affect the availability of C++ features we're checking, so filter them out. Fixes: #17850, #17947