diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2006-07-09 17:18:15 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2006-07-09 17:18:15 (GMT) |
| commit | e015e103709fe12c57bd94207002eafa53733088 (patch) | |
| tree | b879f690dc22367fede57a6b39c7fdbe05a11ae9 | |
| parent | 8f4f1c85078cf5b641d2d35dd185e72121bfb24d (diff) | |
| download | CMake-e015e103709fe12c57bd94207002eafa53733088.zip CMake-e015e103709fe12c57bd94207002eafa53733088.tar.gz CMake-e015e103709fe12c57bd94207002eafa53733088.tar.bz2 | |
ENH: Pass -C flag to cmake to generate the apropriate build command
| -rw-r--r-- | Source/cmBuildCommand.cxx | 8 | ||||
| -rw-r--r-- | Source/cmCTest.cxx | 6 |
2 files changed, 13 insertions, 1 deletions
diff --git a/Source/cmBuildCommand.cxx b/Source/cmBuildCommand.cxx index 405b463..fd3760c 100644 --- a/Source/cmBuildCommand.cxx +++ b/Source/cmBuildCommand.cxx @@ -31,10 +31,16 @@ bool cmBuildCommand::InitialPass(std::vector<std::string> const& args) const char* cacheValue = this->Makefile->GetDefinition(define); std::string makeprogram = args[1]; + std::string configType = "Release"; + const char* cfg = getenv("CMAKE_CONFIG_TYPE"); + if ( cfg ) + { + configType = cfg; + } std::string makecommand = this->Makefile->GetLocalGenerator() ->GetGlobalGenerator()->GenerateBuildCommand (makeprogram.c_str(), this->Makefile->GetProjectName(), 0, - 0, "Release", true, false); + 0, configType.c_str(), true, false); if(cacheValue) { diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx index e7fc7e0..6ec234e 100644 --- a/Source/cmCTest.cxx +++ b/Source/cmCTest.cxx @@ -1336,6 +1336,12 @@ int cmCTest::Run(std::vector<std::string>const& args, std::string* output) i++; this->ConfigType = args[i]; cmSystemTools::ReplaceString(this->ConfigType, ".\\", ""); + if ( !this->ConfigType.empty() ) + { + std::string confTypeEnv + = "CMAKE_CONFIG_TYPE=" + this->ConfigType; + cmSystemTools::PutEnv(confTypeEnv.c_str()); + } } if(this->CheckArgument(arg, "--debug")) |