diff options
| author | Will Schroeder <will.schroeder@kitware.com> | 2000-11-02 15:24:59 (GMT) |
|---|---|---|
| committer | Will Schroeder <will.schroeder@kitware.com> | 2000-11-02 15:24:59 (GMT) |
| commit | 1ae64b11fb358ead554105617f8a4feebb1dc3d1 (patch) | |
| tree | 80cf3d9df59e0e2d4f34eb395044241f5f107d75 /Source | |
| parent | 366c783f6c6b6987a2425f38e51b53e74bb891e0 (diff) | |
| download | CMake-1ae64b11fb358ead554105617f8a4feebb1dc3d1.zip CMake-1ae64b11fb358ead554105617f8a4feebb1dc3d1.tar.gz CMake-1ae64b11fb358ead554105617f8a4feebb1dc3d1.tar.bz2 | |
ENH:Reworked CMake to clearer indicate what the variables do
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmClassFile.cxx | 11 | ||||
| -rw-r--r-- | Source/cmMakefile.cxx | 10 |
2 files changed, 16 insertions, 5 deletions
diff --git a/Source/cmClassFile.cxx b/Source/cmClassFile.cxx index 6c219ed..21af889 100644 --- a/Source/cmClassFile.cxx +++ b/Source/cmClassFile.cxx @@ -21,8 +21,19 @@ void cmClassFile::SetName(const char* name, const char* dir) pathname += "/"; } + // First try and see whether the listed file can be found + // as is without extensions added on. pathname += m_ClassName; std::string hname = pathname; + if(cmSystemTools::FileExists(hname.c_str())) + { + m_HeaderFileOnly = false; + m_FullPath = hname; + return; + } + + // Try various extentions + hname = pathname; hname += ".cxx"; if(cmSystemTools::FileExists(hname.c_str())) { diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 49ee42f..c4eab57 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -42,7 +42,7 @@ bool cmMakefile::ReadMakefile(const char* filename) { std::string line = inbuffer; cmClassFile file; - if(line.find("COMPILE_CLASSES") != std::string::npos) + if(line.find("SOURCE_FILES") != std::string::npos) { if(line.find("\\") != std::string::npos) { @@ -50,7 +50,7 @@ bool cmMakefile::ReadMakefile(const char* filename) } } #ifdef _WIN32 - else if(line.find("WIN32_CLASSES") != std::string::npos) + else if(line.find("WIN32_SOURCE_FILES") != std::string::npos) { if(line.find("\\") != std::string::npos) { @@ -58,7 +58,7 @@ bool cmMakefile::ReadMakefile(const char* filename) } } #else - else if(line.find("UNIX_CLASSES") != std::string::npos) + else if(line.find("UNIX_SOURCE_FILES") != std::string::npos) { if(line.find("\\") != std::string::npos) { @@ -73,7 +73,7 @@ bool cmMakefile::ReadMakefile(const char* filename) this->ReadClasses(fin, true); } } - else if(line.find("TEMPLATE_INSTANCE_DIRECTORY") != std::string::npos) + else if(line.find("AUX_SOURCE_DIRECTORY") != std::string::npos) { this->ReadTemplateInstanceDirectory(line); } @@ -173,7 +173,7 @@ void cmMakefile::ReadClasses(std::ifstream& fin, } // Find all of the files in dir as specified from this line: -// TEMPLATE_INSTANCE_DIRECTORY = dir +// AUX_SOURCE_DIRECTORY = dir // Add all the files to the m_Classes array. void cmMakefile::ReadTemplateInstanceDirectory(std::string& line) |