| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
| |
Run the `clang-format.bash` script to update all our C and C++ code to a
new style defined by `.clang-format`. Use `clang-format` version 6.0.
* If you reached this commit for a line in `git blame`, re-run the blame
operation starting at the parent of this commit to see older history
for the content.
* See the parent commit for instructions to rebase a change across this
style transition commit.
|
|
|
|
|
|
|
|
| |
Add new `version=` parameter in the toolset setting to select the
version. Add variable `CMAKE_VS_PLATFORM_TOOLSET_VERSION` to hold the
version, if one is set (blank indicates default).
Fixes: #17549
|
|
|
|
| |
The method no longer does anything. Remove it and remove calls to it.
|
|
|
|
| |
RAII actually implemented; EndElement() still kept to avoid major reformatting
|
|
|
|
| |
Prepare for future RAII
|
|
|
|
| |
Stream object is now local to `Generate()`
|
|\
| |
| |
| |
| |
| |
| | |
71a033616a added CMAKE_DOTNET_TARGET_FRAMEWORK_VERSION variable
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2032
|
| |
| |
| |
| | |
Fixes: #17955
|
|\ \
| |/
|/|
| |
| |
| |
| | |
b88e138369 cmVisualStudio10TargetGenerator: minor code cleanup
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2063
|
| | |
|
|\ \
| |/
|/|
| |
| |
| |
| | |
a170a59a58 VS: Link CUDA binaries with the device runtime library 'cudadevrt'
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2062
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | | |
a2b5acec3b cmVisualStudio10TargetGenerator: refactor
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2054
|
| |/
| |
| |
| | |
`WritePlatformConfigTag` moved to local `Elem` class; other improvements
|
|\ \
| |/
|/|
| |
| |
| |
| | |
91754b4e60 VS: When not referencing output assembly do not try to copy it either
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2037
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | | |
0bd1d1fcc4 VS: Fix regression in XML generation for CUDA
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2053
|
| | |
| | |
| | |
| | |
| | |
| | | |
Refactoring in commit 3f315dc128 (cmVisualStudio10TargetGenerator: XML
refactoring, 2018-05-02) accidentally left the `<Import>` element for
the CUDA build customizations unclosed.
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
e76a0c6071 VS: improve options generation
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2044
|
| |/ /
| | |
| | |
| | | |
Make use of the `Elem` and `OptionsHelper` classes; some cleanup
|
|\ \ \
| |_|/
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | | |
|
| | | |
|
| | | |
|
| |/ |
|
|/ |
|
| |
|
|\
| |
| |
| |
| |
| |
| | |
83ed65cdde Add generator expressions for VS_SHADER_ source file properties.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2000
|
| | |
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | | |
4465a27882 cmVisualStudio10TargetGenerator: XML refactoring
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2012
|
| |/ |
|
|\ \
| |/
|/|
| |
| |
| |
| | |
27b28c001f VS: Don't turn on /DEBUG:FASTLINK for managed C++ targets
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2011
|
| |
| |
| |
| |
| | |
FastLink is only supported for native C++ targets. Turning it off avoids
a warning when building managed C++.
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
de549083e3 cmVisualStudio10TargetGenerator: warn if /clr flag is set manually
59ec7d50bd cmVisualStudio10TargetGenerator: fix for backward compatibility
663f5120f4 cmGlobalVisualStudioGenerator: remove TargetCanBeReferenced()
359544a907 add tests for using target_link_libraries() with imported managed targets
43571073e0 cmVisualStudio10TargetGenerator: store managed reference information in maps
16fec7e2fc cmVisualStudio10TargetGenerator: make some methods config aware
f3c6828876 cmVisualStudio10TargetGenerator: /clr compatible flags for managed tgt
f9042d807d remove TargetIsCSharpOnly() and use methods from cmGeneratorTarget
...
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1805
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
dfff12c808 VS: Add Elem::Content() helper and usage demo
1f29777798 cmVisualStudio10TargetGenerator: refactoring (continued)
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2005
|
| | | | |
|
| |/ / |
|
| |/
|/| |
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
f59c33a763 VS: Generate a custom command only in the least dependent target
d58d4daa6b cmVisualStudio10TargetGenerator: Use cmLocalVisualStudio10Generator
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1889
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
If a custom command is assigned to multiple targets, generate the build
rule only in the least-dependent `.vcxproj` file. Otherwise MSBuild
will run the command on the first build of a dependent target even if
its dependencies already brought the command up to date (in order to
populates its build log).
Generate targets in least-to-most-dependent order, and assign a custom
command to the least dependent target.
Added cmLocalVisualStudio10Generator::GenerateTargetsDepthFirst to call
cmVisualStudio10TargetGenerator::Generate in least-dependent order.
Moved SourcesVisited from cmVisualStudio10TargetGenerator to
cmLocalVisualStudio10Generator to avoid attaching a custom command to
multiple targets among the local generator.
Fixes: #16767
|
| | |
| | |
| | |
| | |
| | | |
Change the type of a member variable `LocalGenerator` from
`cmLocalVisualStudio7Generator` to `cmLocalVisualStudio10Generator`.
|
| |/
|/| |
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | | |
6ec3e880e7 VS: Add variables to set SDK directories in vcxproj files
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1965
|