This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake".
The branch, next has been updated via 040148125575371543ea890762da9f4467b9529e (commit) via 05dbc940b7e19cdccd7ec73ea173719be66244e1 (commit) via 728820f3ea0faf55ffe1236a44a35e9197fc6291 (commit) from 973ae1be388c84b11b3ad57e4971f9be92f03bd8 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=040148125575371543ea890762da9f4467b9529e commit 040148125575371543ea890762da9f4467b9529e Merge: 973ae1b 05dbc94 Author: Brad King <brad.k...@kitware.com> AuthorDate: Thu Jan 12 15:08:51 2017 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Thu Jan 12 15:08:51 2017 -0500 Merge topic 'cuda-no-def-file-for-device' into next 05dbc940 CUDA: Don't use module definition `.def` files for device linking 728820f3 Merge topic 'cuda-windows' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=05dbc940b7e19cdccd7ec73ea173719be66244e1 commit 05dbc940b7e19cdccd7ec73ea173719be66244e1 Author: Robert Maynard <robert.mayn...@kitware.com> AuthorDate: Thu Jan 12 13:57:27 2017 -0500 Commit: Brad King <brad.k...@kitware.com> CommitDate: Thu Jan 12 15:07:10 2017 -0500 CUDA: Don't use module definition `.def` files for device linking These files are meaningful only to the host linker. 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"]); ----------------------------------------------------------------------- Summary of changes: Source/cmMakefileExecutableTargetGenerator.cxx | 9 --------- Source/cmNinjaNormalTargetGenerator.cxx | 1 - 2 files changed, 10 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits