summaryrefslogtreecommitdiffstats
path: root/Source/cmLocalUnixMakefileGenerator3.cxx
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-03-04 20:46:42 (GMT)
committerStephen Kelly <steveire@gmail.com>2015-03-09 19:49:16 (GMT)
commit0b945ea9a6a38d1b3ee27cc32afb4268bd571600 (patch)
tree79411aba297b00a76587c9bd855e3a9e5afa3e10 /Source/cmLocalUnixMakefileGenerator3.cxx
parent5c559f11137dcb14113a3c5df99ff896c65c7596 (diff)
downloadCMake-0b945ea9a6a38d1b3ee27cc32afb4268bd571600.zip
CMake-0b945ea9a6a38d1b3ee27cc32afb4268bd571600.tar.gz
CMake-0b945ea9a6a38d1b3ee27cc32afb4268bd571600.tar.bz2
Genex: Allow COMPILE_LANGUAGE when processing compile definitions.
Issue an error if this is encountered by an IDE generator.
Diffstat (limited to 'Source/cmLocalUnixMakefileGenerator3.cxx')
-rw-r--r--Source/cmLocalUnixMakefileGenerator3.cxx32
1 files changed, 16 insertions, 16 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 432cb3a..9ecb029 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -2094,26 +2094,26 @@ void cmLocalUnixMakefileGenerator3
<< "set(CMAKE_" << l->first << "_COMPILER_ID \""
<< cid << "\")\n";
}
- }
- // Build a list of preprocessor definitions for the target.
- std::set<std::string> defines;
- this->AddCompileDefinitions(defines, &target,
- this->ConfigurationName);
- if(!defines.empty())
- {
- cmakefileStream
- << "\n"
- << "# Preprocessor definitions for this target.\n"
- << "set(CMAKE_TARGET_DEFINITIONS\n";
- for(std::set<std::string>::const_iterator di = defines.begin();
- di != defines.end(); ++di)
+ // Build a list of preprocessor definitions for the target.
+ std::set<std::string> defines;
+ this->AddCompileDefinitions(defines, &target,
+ this->ConfigurationName, l->first);
+ if(!defines.empty())
{
cmakefileStream
- << " " << this->EscapeForCMake(*di) << "\n";
+ << "\n"
+ << "# Preprocessor definitions for this target.\n"
+ << "set(CMAKE_TARGET_DEFINITIONS_" << l->first << "\n";
+ for(std::set<std::string>::const_iterator di = defines.begin();
+ di != defines.end(); ++di)
+ {
+ cmakefileStream
+ << " " << this->EscapeForCMake(*di) << "\n";
+ }
+ cmakefileStream
+ << " )\n";
}
- cmakefileStream
- << " )\n";
}
// Store include transform rule properties. Write the directory