diff options
| author | Robert Maynard <robert.maynard@kitware.com> | 2016-09-19 17:14:47 (GMT) |
|---|---|---|
| committer | Robert Maynard <robert.maynard@kitware.com> | 2016-11-14 16:36:44 (GMT) |
| commit | 489c52ce680df6439f9c1e553cd2925ca8944cb1 (patch) | |
| tree | 4f1bba3a3e3ef47c9e7456d4b3c4098d57fc6fa1 /Source | |
| parent | bbaf24341026cdacd1e313dd3f8e3501e9c4070e (diff) | |
| download | CMake-489c52ce680df6439f9c1e553cd2925ca8944cb1.zip CMake-489c52ce680df6439f9c1e553cd2925ca8944cb1.tar.gz CMake-489c52ce680df6439f9c1e553cd2925ca8944cb1.tar.bz2 | |
CUDA: Use the host compiler for linking CUDA executables and shared libs.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmCoreTryCompile.cxx | 3 | ||||
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx index b1d3775..3b46fc0 100644 --- a/Source/cmCoreTryCompile.cxx +++ b/Source/cmCoreTryCompile.cxx @@ -44,8 +44,6 @@ static std::string const kCMAKE_TRY_COMPILE_OSX_ARCHITECTURES = "CMAKE_TRY_COMPILE_OSX_ARCHITECTURES"; static std::string const kCMAKE_TRY_COMPILE_PLATFORM_VARIABLES = "CMAKE_TRY_COMPILE_PLATFORM_VARIABLES"; -static std::string const kCMAKE_CUDA_HOST_COMPILER = - "CMAKE_CUDA_HOST_COMPILER"; int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv, bool isTryRun) @@ -455,7 +453,6 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv, vars.insert(kCMAKE_OSX_SYSROOT); vars.insert(kCMAKE_POSITION_INDEPENDENT_CODE); vars.insert(kCMAKE_SYSROOT); - vars.insert(kCMAKE_CUDA_HOST_COMPILER); if (const char* varListStr = this->Makefile->GetDefinition( kCMAKE_TRY_COMPILE_PLATFORM_VARIABLES)) { diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 1ccd489..8d81d61 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -63,6 +63,8 @@ static const char* ruleReplaceVars[] = { "CMAKE_CURRENT_BINARY_DIR", "CMAKE_RANLIB", "CMAKE_LINKER", + "CMAKE_CUDA_HOST_COMPILER", + "CMAKE_CUDA_HOST_LINK_LAUNCHER", "CMAKE_CL_SHOWINCLUDES_PREFIX" }; |