diff options
| author | David Cole <david.cole@kitware.com> | 2011-08-02 19:11:01 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-08-02 19:11:01 (GMT) |
| commit | e9a6d86d91451468e4a4bf52e8cd23199362bffa (patch) | |
| tree | f59083cc55f9f80da247a4bbc7062442db09a1d1 | |
| parent | ab24bdeecc985f197d637cb593008ae29ae882cb (diff) | |
| parent | f32f6f0652b8b99abd2cf8558a193571e47e9217 (diff) | |
| download | CMake-e9a6d86d91451468e4a4bf52e8cd23199362bffa.zip CMake-e9a6d86d91451468e4a4bf52e8cd23199362bffa.tar.gz CMake-e9a6d86d91451468e4a4bf52e8cd23199362bffa.tar.bz2 | |
Merge topic 'ExcludeCMakesFilesFromCodeBlocksProject'
f32f6f0 Don't put files from CMAKE_ROOT into CodeBlocks projects (#12110)
| -rw-r--r-- | Source/cmExtraCodeBlocksGenerator.cxx | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx index 4f93067..28ea10a 100644 --- a/Source/cmExtraCodeBlocksGenerator.cxx +++ b/Source/cmExtraCodeBlocksGenerator.cxx @@ -266,10 +266,17 @@ void cmExtraCodeBlocksGenerator } // Convert + const char* cmakeRoot = mf->GetDefinition("CMAKE_ROOT"); for (std::vector<std::string>::const_iterator jt = listFiles.begin(); jt != listFiles.end(); ++jt) { + // don't put cmake's own files into the project (#12110): + if (jt->find(cmakeRoot) == 0) + { + continue; + } + const std::string &relative = cmSystemTools::RelativePath( it->second[0]->GetMakefile()->GetHomeDirectory(), jt->c_str()); |