diff options
| author | Brad King <brad.king@kitware.com> | 2019-07-02 12:36:45 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-07-02 12:36:56 (GMT) |
| commit | 41acd44625f63d0730fdbd983ea598b227622087 (patch) | |
| tree | 5fb29c346d05e88fa7eae3a7bef52233f2d1ec36 /Source/cmVisualStudio10TargetGenerator.cxx | |
| parent | 554c2ed743f4134df5552d4702c6b1e1dee97079 (diff) | |
| parent | a4d502a5bfc38254ccb49615be8d7070fca6819e (diff) | |
| download | CMake-41acd44625f63d0730fdbd983ea598b227622087.zip CMake-41acd44625f63d0730fdbd983ea598b227622087.tar.gz CMake-41acd44625f63d0730fdbd983ea598b227622087.tar.bz2 | |
Merge topic 'cuda-no-device-link-when-disabled'
a4d502a5bf CUDA: Do not device link if CUDA is not an enabled language
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3491
Diffstat (limited to 'Source/cmVisualStudio10TargetGenerator.cxx')
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 150ede7..0420881 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -3064,7 +3064,7 @@ bool cmVisualStudio10TargetGenerator::ComputeCudaLinkOptions( Options& cudaLinkOptions = *pOptions; // Determine if we need to do a device link - bool doDeviceLinking = requireDeviceLinking( + const bool doDeviceLinking = requireDeviceLinking( *this->GeneratorTarget, *this->LocalGenerator, configName); cudaLinkOptions.AddFlag("PerformDeviceLink", |