summaryrefslogtreecommitdiffstats
path: root/Source/cmVisualStudio10TargetGenerator.cxx
Commit message (Collapse)AuthorAgeFilesLines
* cmVisualStudioGeneratorOptions::Parse(): const std::string& argumentVitaly Stakhovsky2018-08-131-11/+11
|
* cmCompiledGeneratorExpression::Evaluate(): return const std::string&Vitaly Stakhovsky2018-08-091-10/+9
|
* Merge topic 'csharp-link-file'Brad King2018-07-091-4/+7
|\ | | | | | | | | | | | | | | 8a6107650e VS: Only link cs files when they're not in binary dir Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Michael Stürmer <michael.stuermer@schaeffler.com> Merge-request: !2177
| * VS: Only link cs files when they're not in binary dirRobert Dailey2018-07-061-4/+7
| | | | | | | | | | | | When `*.cs` files are provided, do not generate a `<Link>` element in the `.csproj` project if those files are descendants of `CMAKE_CURRENT_BINARY_DIR`. This comparison happens for each file.
* | Merge topic 'vs_debugger'Brad King2018-06-221-2/+39
|\ \ | | | | | | | | | | | | | | | | | | 797de7a6f6 VS10Project: Expand VS_DEBUGGER_* capabilities Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2150
| * | VS10Project: Expand VS_DEBUGGER_* capabilitiesJon Chronopoulos2018-06-171-2/+39
| | | | | | | | | | | | | | | This adds VS_DEBUGGER_COMMAND_ARGUMENTS and VS_DEBUGGER_ENVIRONMENT as well as allowing VS_DEBUGGER_* to use generator expressions.
* | | Merge topic 'vs-cuda-no-host-includes'Brad King2018-06-201-0/+1
|\ \ \ | |/ / |/| / | |/ | | | | | | 543b6826ee VS: Avoid duplication of CUDA include directories Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2158
| * VS: Avoid duplication of CUDA include directoriesBrad King2018-06-201-0/+1
| | | | | | | | | | | | | | | | We already place all include directories for CUDA inside `CudaCompile` so we do not need to use any from `ClCompile`. Tell `CudaCompile` not to use the host compiler's include directory settings. Fixes: #18101
* | LINK_OPTIONS: Add new family of propertiesMarc Chevrier2018-06-061-0/+5
|/ | | | | | | | | | | | | | This family enable to manage link flags Three new properties: * directory property: LINK_OPTIONS * target properties: LINK_OPTIONS and INTERFACE_LINK_OPTIONS Two new commands * add_link_options(): to populate directory property * target_link_options(): to populate target properties Fixes: #16543
* Revise C++ coding style using clang-format-6.0Kitware Robot2018-06-011-29/+38
| | | | | | | | | | | | 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.
* VS: Add option to select the version of the toolset used by VS 2017Basil Fierz2018-05-291-0/+5
| | | | | | | | 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
* cmVisualStudio10TargetGenerator: Remove empty Elem::EndElement()Vitaly Stakhovsky2018-05-251-125/+31
| | | | The method no longer does anything. Remove it and remove calls to it.
* cmVisualStudio10TargetGenerator: close XML tag in Elem destructorVitaly Stakhovsky2018-05-251-6/+12
| | | | RAII actually implemented; EndElement() still kept to avoid major reformatting
* cmVisualStudio10TargetGenerator: make sure each Elem has right scopeVitaly Stakhovsky2018-05-221-19/+29
| | | | Prepare for future RAII
* cmVisualStudio10TargetGenerator: remove BuildFileStream memberVitaly Stakhovsky2018-05-161-386/+393
| | | | Stream object is now local to `Generate()`
* Merge topic 'dotnet_target_fw_init'Brad King2018-05-161-4/+11
|\ | | | | | | | | | | | | 71a033616a added CMAKE_DOTNET_TARGET_FRAMEWORK_VERSION variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2032
| * added CMAKE_DOTNET_TARGET_FRAMEWORK_VERSION variableMichael Stürmer2018-05-151-4/+11
| | | | | | | | Fixes: #17955
* | Merge topic 'vs-nitpicks'Brad King2018-05-161-73/+69
|\ \ | |/ |/| | | | | | | | | b88e138369 cmVisualStudio10TargetGenerator: minor code cleanup Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2063
| * cmVisualStudio10TargetGenerator: minor code cleanupVitaly Stakhovsky2018-05-111-73/+69
| |
* | 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 'vs-refactor'Brad King2018-05-111-107/+92
|\ \ | | | | | | | | | | | | | | | | | | a2b5acec3b cmVisualStudio10TargetGenerator: refactor Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2054
| * | cmVisualStudio10TargetGenerator: refactorVitaly Stakhovsky2018-05-091-107/+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 '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.
* | | Merge topic 'vs-improve-options'Brad King2018-05-081-116/+94
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | e76a0c6071 VS: improve options generation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2044
| * | | VS: improve options generationVitaly Stakhovsky2018-05-051-116/+94
| |/ / | | | | | | | | | Make use of the `Elem` and `OptionsHelper` classes; some cleanup
* | | Merge topic 'deprecate_static_managed_targets'Brad King2018-05-081-11/+25
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | 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
| |/
* | VS Generator: Only include default certificate if it was actually copiedMark Ingram2018-05-041-4/+8
|/
* cmVisualStudio10TargetGenerator: XML refactoringVitaly Stakhovsky2018-05-041-790/+732
|
* Merge topic 'vs-shader-generator-expressions'Brad King2018-04-301-6/+33
|\ | | | | | | | | | | | | 83ed65cdde Add generator expressions for VS_SHADER_ source file properties. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2000
| * Add generator expressions for VS_SHADER_ source file properties.Jeremiah van Oosten2018-04-261-6/+33
| |
* | Merge topic 'vs-refactor-xml'Brad King2018-04-271-55/+48
|\ \ | | | | | | | | | | | | | | | | | | 4465a27882 cmVisualStudio10TargetGenerator: XML refactoring Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2012
| * | cmVisualStudio10TargetGenerator: XML refactoringVitaly Stakhovsky2018-04-261-55/+48
| |/
* | Merge topic 'vs-managed-fastlink'Brad King2018-04-271-0/+9
|\ \ | |/ |/| | | | | | | | | 27b28c001f VS: Don't turn on /DEBUG:FASTLINK for managed C++ targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2011
| * VS: Don't turn on /DEBUG:FASTLINK for managed C++ targetsCalum Robinson2018-04-261-0/+9
| | | | | | | | | | FastLink is only supported for native C++ targets. Turning it off avoids a warning when building managed C++.
* | Merge topic 'csharp_reference_imported_targets'Brad King2018-04-261-31/+116
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | cmVisualStudio10TargetGenerator: warn if /clr flag is set manuallyMichael Stürmer2018-04-241-2/+14
| | |
| * | cmVisualStudio10TargetGenerator: fix for backward compatibilityMichael Stürmer2018-04-241-5/+18
| | |
| * | cmGlobalVisualStudioGenerator: remove TargetCanBeReferenced()Michael Stürmer2018-04-241-1/+4
| | |
| * | cmVisualStudio10TargetGenerator: store managed reference information in mapsMichael Stürmer2018-04-241-7/+51
| | |
| * | cmVisualStudio10TargetGenerator: make some methods config awareMichael Stürmer2018-04-231-9/+17
| | |
| * | cmVisualStudio10TargetGenerator: /clr compatible flags for managed tgtMichael Stürmer2018-04-231-1/+6
| | |
| * | remove TargetIsCSharpOnly() and use methods from cmGeneratorTargetMichael Stürmer2018-04-231-12/+12
| | |