diff options
author | Brad King <brad.king@kitware.com> | 2012-03-28 12:41:48 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2012-03-28 12:58:38 (GMT) |
commit | 1c489923d54592dfdd0a9421f585bb45ccf9aa44 (patch) | |
tree | e2e94ff1e33faba015373ebe4e85be74127a1f03 /Source/cmGeneratorTarget.cxx | |
parent | b291d9e756b76ce85ebcc314c14de532e8ad477f (diff) | |
download | CMake-1c489923d54592dfdd0a9421f585bb45ccf9aa44.zip CMake-1c489923d54592dfdd0a9421f585bb45ccf9aa44.tar.gz CMake-1c489923d54592dfdd0a9421f585bb45ccf9aa44.tar.bz2 |
Always compile sources with known language
Refactoring by commit 11d9b211 (Add cmGeneratorTarget to represent a
target during generation, 2012-03-07) and commit 45c2f932 (Simplify
cmMakefileTargetGenerator using cmGeneratorTarget, 2012-03-07) preserved
behavior introduced by commit 7740ccd1 (some cleanup of the makefile
generator, 2006-02-14) that favored the IgnoreFile extension test over
the availability of a known compilation language associated with a
source file. If a source is not marked as HEADER_FILE_ONLY and has a
known language extension or an explicit LANGUAGE property it should be
treated as that language. The LANGUAGE source file property
documentation says so.
Diffstat (limited to 'Source/cmGeneratorTarget.cxx')
-rw-r--r-- | Source/cmGeneratorTarget.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index 7979928..3f43465 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -58,6 +58,10 @@ void cmGeneratorTarget::ClassifySources() this->ExternalObjects.push_back(sf); if(isObjLib) { badObjLib.push_back(sf); } } + else if(sf->GetLanguage()) + { + this->ObjectSources.push_back(sf); + } else if(ext == "def") { this->ModuleDefinitionFile = sf->GetFullPath(); @@ -75,10 +79,6 @@ void cmGeneratorTarget::ClassifySources() // No message or diagnosis should be given. this->ExtraSources.push_back(sf); } - else if(sf->GetLanguage()) - { - this->ObjectSources.push_back(sf); - } else { this->ExtraSources.push_back(sf); |