diff options
| author | Brad King <brad.king@kitware.com> | 2017-01-16 16:01:20 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2017-01-16 16:01:20 (GMT) |
| commit | 4433be6bce6f69d26dee1e2a4213e409bde66a21 (patch) | |
| tree | babfc6f93b5a34198e9a7c51b5ef8ecd2a9c78c0 /Source | |
| parent | 743085a5795ae666a56a3eeea59c5467a0b714a8 (diff) | |
| parent | 05dbc940b7e19cdccd7ec73ea173719be66244e1 (diff) | |
| download | CMake-4433be6bce6f69d26dee1e2a4213e409bde66a21.zip CMake-4433be6bce6f69d26dee1e2a4213e409bde66a21.tar.gz CMake-4433be6bce6f69d26dee1e2a4213e409bde66a21.tar.bz2 | |
Merge topic 'cuda-no-def-file-for-device'
05dbc940 CUDA: Don't use module definition `.def` files for device linking
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmMakefileExecutableTargetGenerator.cxx | 9 | ||||
| -rw-r--r-- | Source/cmNinjaNormalTargetGenerator.cxx | 1 |
2 files changed, 0 insertions, 10 deletions
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx index 4bc706c..b76ddeb 100644 --- a/Source/cmMakefileExecutableTargetGenerator.cxx +++ b/Source/cmMakefileExecutableTargetGenerator.cxx @@ -157,15 +157,6 @@ void cmMakefileExecutableTargetGenerator::WriteDeviceExecutableRule( this->LocalGenerator->AppendFlags( linkFlags, this->GeneratorTarget->GetProperty(linkFlagsConfig)); - { - CM_AUTO_PTR<cmLinkLineComputer> linkLineComputer( - this->CreateLinkLineComputer( - this->LocalGenerator, - this->LocalGenerator->GetStateSnapshot().GetDirectory())); - - this->AddModuleDefinitionFlag(linkLineComputer.get(), linkFlags); - } - // Construct a list of files associated with this executable that // may need to be cleaned. std::vector<std::string> exeCleanFiles; diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx index bc8d8ff..b172478 100644 --- a/Source/cmNinjaNormalTargetGenerator.cxx +++ b/Source/cmNinjaNormalTargetGenerator.cxx @@ -663,7 +663,6 @@ void cmNinjaNormalTargetGenerator::WriteDeviceLinkStatement() this->addPoolNinjaVariable("JOB_POOL_LINK", &genTarget, vars); - this->AddModuleDefinitionFlag(linkLineComputer.get(), vars["LINK_FLAGS"]); vars["LINK_FLAGS"] = cmGlobalNinjaGenerator::EncodeLiteral(vars["LINK_FLAGS"]); |