summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalVisualStudioGenerator.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-04-03 16:51:53 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2014-04-03 16:51:53 (GMT)
commit5376151aa1d724b6d7ddef8d2e521d97cbfa74ae (patch)
tree88ceb52c0ff365ceb53ea408f45fe729cfbd7f3c /Source/cmGlobalVisualStudioGenerator.cxx
parent93054aa84f283de17c58fa2ee19a2a4a1668027d (diff)
parent9407174b1a0f1b4f8edf7fe08cc85ab6e990d59f (diff)
downloadCMake-5376151aa1d724b6d7ddef8d2e521d97cbfa74ae.zip
CMake-5376151aa1d724b6d7ddef8d2e521d97cbfa74ae.tar.gz
CMake-5376151aa1d724b6d7ddef8d2e521d97cbfa74ae.tar.bz2
Merge topic 'target-transitive-sources'
9407174b target_sources: New command to add sources to target. 81ad69e0 Make the SOURCES target property writable. 6e636f2e cmTarget: Make the SOURCES origin tracable. 3676fb49 cmTarget: Allow transitive evaluation of SOURCES property. e6971df6 cmTarget: Make the source files depend on the config. df753df9 cmGeneratorTarget: Don't add computed sources to the target. 869328aa cmComputeTargetDepends: Use valid config to compute target depends.
Diffstat (limited to 'Source/cmGlobalVisualStudioGenerator.cxx')
-rw-r--r--Source/cmGlobalVisualStudioGenerator.cxx10
1 files changed, 9 insertions, 1 deletions
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index 38f709f..c5a0e29 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -815,7 +815,15 @@ cmGlobalVisualStudioGenerator::TargetIsFortranOnly(cmTarget const& target)
{
// check to see if this is a fortran build
std::set<std::string> languages;
- target.GetLanguages(languages);
+ {
+ // Issue diagnostic if the source files depend on the config.
+ std::vector<cmSourceFile*> sources;
+ if (!target.GetConfigCommonSourceFiles(sources))
+ {
+ return false;
+ }
+ }
+ target.GetLanguages(languages, "");
if(languages.size() == 1)
{
if(*languages.begin() == "Fortran")