mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-08 14:50:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cuda_vs_skip_computation' into release-3.18

Browse Source 
Merge-request: !5422
This commit is contained in:
Brad King
2020-10-27 07:32:37 -04:00
parent e9109dec36 dd77dec18d
commit 3969c86b51
5 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmGeneratorTarget.cxx
View File

@@ -6914,6 +6914,14 @@ void cmGeneratorTarget::GetLanguages(std::set<std::string>& languages,
}
}
bool cmGeneratorTarget::IsLanguageUsed(std::string const& language,
std::string const& config) const
{
std::set<std::string> languages;
this->GetLanguages(languages, config);
return languages.count(language);
}
bool cmGeneratorTarget::IsCSharpOnly() const
{
// Only certain target types may compile CSharp.

2
Source/cmGeneratorTarget.h
View File

@@ -397,6 +397,8 @@ public:
// until we have per-target object file properties.
void GetLanguages(std::set<std::string>& languages,
std::string const& config) const;
bool IsLanguageUsed(std::string const& language,
std::string const& config) const;
bool IsCSharpOnly() const;

6
Source/cmVisualStudio10TargetGenerator.cxx
View File

@@ -3018,7 +3018,8 @@ bool cmVisualStudio10TargetGenerator::ComputeCudaOptions()
return true;
}
for (std::string const& c : this->Configurations) {
if (!this->ComputeCudaOptions(c)) {
if (this->GeneratorTarget->IsLanguageUsed("CUDA", c) &&
!this->ComputeCudaOptions(c)) {
return false;
}
}
@@ -3158,7 +3159,8 @@ bool cmVisualStudio10TargetGenerator::ComputeCudaOptions(
void cmVisualStudio10TargetGenerator::WriteCudaOptions(
Elem& e1, std::string const& configName)
{
if (!this->MSTools || !this->GlobalGenerator->IsCudaEnabled()) {
if (!this->MSTools || !this->GlobalGenerator->IsCudaEnabled() ||
!this->GeneratorTarget->IsLanguageUsed("CUDA", configName)) {
return;
}
Elem e2(e1, "CudaCompile");

4
Tests/RunCMake/CMP0104/CMP0104-Common.cmake
View File

@@ -1,2 +1,6 @@
# Make sure CMP0104 isn't issued for CXX targets created prior to enabling CUDA. See #21341.
enable_language(CXX)
add_library(cxx main.cxx)
enable_language(CUDA)
add_library(cuda main.cu)

3
Tests/RunCMake/CMP0104/main.cxx Normal file
View File

@@ -0,0 +1,3 @@
int main()
{
}