diff options
| author | Brad King <brad.king@kitware.com> | 2012-03-13 13:22:24 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-03-16 14:18:01 (GMT) |
| commit | c68cc0661218c62f32d11cb600183e645c81a3de (patch) | |
| tree | f5f9ed60ee709ba8d5adc97e38e41dbfe4aab9cf /Source/cmProjectCommand.cxx | |
| parent | 48eb7fc7d7b3fa5570a7b32968fa2cff07bf6fe7 (diff) | |
| parent | 3a53005f7dd5e582b855ef1f3c0e6814ce7d024a (diff) | |
| download | CMake-c68cc0661218c62f32d11cb600183e645c81a3de.zip CMake-c68cc0661218c62f32d11cb600183e645c81a3de.tar.gz CMake-c68cc0661218c62f32d11cb600183e645c81a3de.tar.bz2 | |
Merge branch 'object-library' into ninja-object-library
Diffstat (limited to 'Source/cmProjectCommand.cxx')
| -rw-r--r-- | Source/cmProjectCommand.cxx | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/Source/cmProjectCommand.cxx b/Source/cmProjectCommand.cxx index 6e3b6af..fcf0a49 100644 --- a/Source/cmProjectCommand.cxx +++ b/Source/cmProjectCommand.cxx @@ -77,6 +77,24 @@ bool cmProjectCommand languages.push_back("CXX"); } this->Makefile->EnableLanguage(languages, false); + std::string extraInclude = "CMAKE_PROJECT_" + args[0] + "_INCLUDE"; + const char* include = this->Makefile->GetDefinition(extraInclude.c_str()); + if(include) + { + std::string fullFilePath; + bool readit = + this->Makefile->ReadListFile( this->Makefile->GetCurrentListFile(), + include); + if(!readit && !cmSystemTools::GetFatalErrorOccured()) + { + std::string m = + "could not find file:\n" + " "; + m += include; + this->SetError(m.c_str()); + return false; + } + } return true; } |