kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmMakefile: Out-of-line the directory methods.

This commit is contained in:
Stephen Kelly 2015-04-16 09:24:16 +02:00 committed by Brad King
parent 0f3c8cfa96
commit 8dc3a67c9c
2 changed files with 35 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Source/cmMakefile.cxx
View File

@ -1667,6 +1667,37 @@ void cmMakefile::AddSubDirectory(const std::string& srcPath,
} }
} }
void cmMakefile::SetCurrentSourceDirectory(const std::string& dir)
{
this->cmStartDirectory = dir;
cmSystemTools::ConvertToUnixSlashes(this->cmStartDirectory);
this->cmStartDirectory =
cmSystemTools::CollapseFullPath(this->cmStartDirectory);
this->AddDefinition("CMAKE_CURRENT_SOURCE_DIR",
this->cmStartDirectory.c_str());
}
const char* cmMakefile::GetCurrentSourceDirectory() const
{
return this->cmStartDirectory.c_str();
}
void cmMakefile::SetCurrentBinaryDirectory(const std::string& dir)
{
this->StartOutputDirectory = dir;
cmSystemTools::ConvertToUnixSlashes(this->StartOutputDirectory);
this->StartOutputDirectory =
cmSystemTools::CollapseFullPath(this->StartOutputDirectory);
cmSystemTools::MakeDirectory(this->StartOutputDirectory.c_str());
this->AddDefinition("CMAKE_CURRENT_BINARY_DIR",
this->StartOutputDirectory.c_str());
}
const char* cmMakefile::GetCurrentBinaryDirectory() const
{
return this->StartOutputDirectory.c_str();
}
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void cmMakefile::AddIncludeDirectories(const std::vector<std::string> &incs, void cmMakefile::AddIncludeDirectories(const std::vector<std::string> &incs,
bool before) bool before)

41
Source/cmMakefile.h
View File

@ -447,43 +447,10 @@ public:
*/ */
void SetArgcArgv(const std::vector<std::string>& args); void SetArgcArgv(const std::vector<std::string>& args);
//@{ void SetCurrentSourceDirectory(const std::string& dir);
/** const char* GetCurrentSourceDirectory() const;
* Set/Get the start directory (or output directory). The start directory void SetCurrentBinaryDirectory(const std::string& dir);
* is the directory of the CMakeLists.txt file that started the current const char* GetCurrentBinaryDirectory() const;
* round of processing. Remember that CMake processes CMakeLists files by
* recursing up the tree starting at the StartDirectory and going up until
* it reaches the HomeDirectory.
*/
void SetCurrentSourceDirectory(const std::string& dir)
{
this->cmStartDirectory = dir;
cmSystemTools::ConvertToUnixSlashes(this->cmStartDirectory);
this->cmStartDirectory =
cmSystemTools::CollapseFullPath(this->cmStartDirectory);
this->AddDefinition("CMAKE_CURRENT_SOURCE_DIR",
this->cmStartDirectory.c_str());
}
void SetCurrentBinaryDirectory(const std::string& dir)
{
this->StartOutputDirectory = dir;
cmSystemTools::ConvertToUnixSlashes(this->StartOutputDirectory);
this->StartOutputDirectory =
cmSystemTools::CollapseFullPath(this->StartOutputDirectory);
cmSystemTools::MakeDirectory(this->StartOutputDirectory.c_str());
this->AddDefinition("CMAKE_CURRENT_BINARY_DIR",
this->StartOutputDirectory.c_str());
}
//@}
const char* GetCurrentSourceDirectory() const
{
return this->cmStartDirectory.c_str();
}
const char* GetCurrentBinaryDirectory() const
{
return this->StartOutputDirectory.c_str();
}
/* Get the current CMakeLists.txt file that is being processed. This /* Get the current CMakeLists.txt file that is being processed. This
* is just used in order to be able to 'branch' from one file to a second * is just used in order to be able to 'branch' from one file to a second