diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2006-03-10 20:03:09 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2006-03-10 20:03:09 (GMT) |
| commit | 862f5df25c509e2df59d00597b0c4b4d14cf5eaa (patch) | |
| tree | 79e19e06c0961f43690788cac9c2f23b4931a2cf /Source/CTest/cmCTestBuildCommand.cxx | |
| parent | c0161e9e57321f283fc88812779d627fb722a40a (diff) | |
| download | CMake-862f5df25c509e2df59d00597b0c4b4d14cf5eaa.zip CMake-862f5df25c509e2df59d00597b0c4b4d14cf5eaa.tar.gz CMake-862f5df25c509e2df59d00597b0c4b4d14cf5eaa.tar.bz2 | |
STYLE: Fix some style issues
Diffstat (limited to 'Source/CTest/cmCTestBuildCommand.cxx')
| -rw-r--r-- | Source/CTest/cmCTestBuildCommand.cxx | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/Source/CTest/cmCTestBuildCommand.cxx b/Source/CTest/cmCTestBuildCommand.cxx index 361bf66..91cb366 100644 --- a/Source/CTest/cmCTestBuildCommand.cxx +++ b/Source/CTest/cmCTestBuildCommand.cxx @@ -25,16 +25,16 @@ //---------------------------------------------------------------------------- cmCTestBuildCommand::cmCTestBuildCommand() { - m_GlobalGenerator = 0; + this->GlobalGenerator = 0; } //---------------------------------------------------------------------------- cmCTestBuildCommand::~cmCTestBuildCommand() { - if ( m_GlobalGenerator ) + if ( this->GlobalGenerator ) { - delete m_GlobalGenerator; - m_GlobalGenerator = 0; + delete this->GlobalGenerator; + this->GlobalGenerator = 0; } } @@ -91,10 +91,11 @@ bool cmCTestBuildCommand::InitialPass( if ( build_dir ) { - m_CTest->SetCTestConfiguration("BuildDirectory", build_dir); + this->CTest->SetCTestConfiguration("BuildDirectory", build_dir); } - cmCTestGenericHandler* handler = m_CTest->GetInitializedHandler("build"); + cmCTestGenericHandler* handler + = this->CTest->GetInitializedHandler("build"); if ( !handler ) { this->SetError("internal CTest error. Cannot instantiate build handler"); @@ -105,7 +106,7 @@ bool cmCTestBuildCommand::InitialPass( = m_Makefile->GetDefinition("CTEST_BUILD_COMMAND"); if ( ctestBuildCommand && *ctestBuildCommand ) { - m_CTest->SetCTestConfiguration("MakeCommand", ctestBuildCommand); + this->CTest->SetCTestConfiguration("MakeCommand", ctestBuildCommand); } else { @@ -124,28 +125,29 @@ bool cmCTestBuildCommand::InitialPass( { cmakeBuildConfiguration = "Release"; } - if ( m_GlobalGenerator ) + if ( this->GlobalGenerator ) { - if ( strcmp(m_GlobalGenerator->GetName(), cmakeGeneratorName) != 0 ) + if ( strcmp(this->GlobalGenerator->GetName(), + cmakeGeneratorName) != 0 ) { - delete m_GlobalGenerator; - m_GlobalGenerator = 0; + delete this->GlobalGenerator; + this->GlobalGenerator = 0; } } - if ( !m_GlobalGenerator ) + if ( !this->GlobalGenerator ) { - m_GlobalGenerator = + this->GlobalGenerator = m_Makefile->GetCMakeInstance()->CreateGlobalGenerator( cmakeGeneratorName); } - m_GlobalGenerator->FindMakeProgram(m_Makefile); + this->GlobalGenerator->FindMakeProgram(m_Makefile); const char* cmakeMakeProgram = m_Makefile->GetDefinition("CMAKE_MAKE_PROGRAM"); std::string buildCommand - = m_GlobalGenerator->GenerateBuildCommand(cmakeMakeProgram, + = this->GlobalGenerator->GenerateBuildCommand(cmakeMakeProgram, cmakeProjectName, cmakeBuildAdditionalFlags, 0, cmakeBuildConfiguration, true); - m_CTest->SetCTestConfiguration("MakeCommand", buildCommand.c_str()); + this->CTest->SetCTestConfiguration("MakeCommand", buildCommand.c_str()); } else { |