diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2004-08-11 20:57:27 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2004-08-11 20:57:27 (GMT) |
| commit | bb32a51825648f5fe44c12df8a3becd5aa88061e (patch) | |
| tree | c620e4bfc2e261722114aec03f7ed9518331f000 /Source | |
| parent | 2a1bbabb6b48e7f313977d3b20efa872b3a05a7b (diff) | |
| download | CMake-bb32a51825648f5fe44c12df8a3becd5aa88061e.zip CMake-bb32a51825648f5fe44c12df8a3becd5aa88061e.tar.gz CMake-bb32a51825648f5fe44c12df8a3becd5aa88061e.tar.bz2 | |
ENH: change RUN_TESTS to use -C and not -D also use GetRequiredDefinition where needed
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalVisualStudio6Generator.cxx | 12 | ||||
| -rw-r--r-- | Source/cmGlobalVisualStudio7Generator.cxx | 10 |
2 files changed, 11 insertions, 11 deletions
diff --git a/Source/cmGlobalVisualStudio6Generator.cxx b/Source/cmGlobalVisualStudio6Generator.cxx index 5dfda72..dc25c7e 100644 --- a/Source/cmGlobalVisualStudio6Generator.cxx +++ b/Source/cmGlobalVisualStudio6Generator.cxx @@ -36,7 +36,7 @@ void cmGlobalVisualStudio6Generator::EnableLanguage(const char* lang, void cmGlobalVisualStudio6Generator::GenerateConfigurations(cmMakefile* mf) { - std::string fname= mf->GetDefinition("CMAKE_ROOT"); + std::string fname= mf->GetRequiredDefinition("CMAKE_ROOT"); const char* def= mf->GetDefinition( "MSPROJECT_TEMPLATE_DIRECTORY"); if(def) { @@ -172,7 +172,7 @@ void cmGlobalVisualStudio6Generator::Generate() gen[0]->GetMakefile()-> AddUtilityCommand("ALL_BUILD", "echo","\"Build all projects\"",false,srcs); std::string cmake_command = - m_LocalGenerators[0]->GetMakefile()->GetDefinition("CMAKE_COMMAND"); + m_LocalGenerators[0]->GetMakefile()->GetRequiredDefinition("CMAKE_COMMAND"); gen[0]->GetMakefile()-> AddUtilityCommand("INSTALL", cmake_command.c_str(), "-DBUILD_TYPE=$(IntDir) -P cmake_install.cmake",false,srcs); @@ -393,7 +393,7 @@ inline std::string removeQuotes(const std::string& s) void cmGlobalVisualStudio6Generator::SetupTests() { std::string ctest = - m_LocalGenerators[0]->GetMakefile()->GetDefinition("CMAKE_COMMAND"); + m_LocalGenerators[0]->GetMakefile()->GetRequiredDefinition("CMAKE_COMMAND"); ctest = removeQuotes(ctest); ctest = cmSystemTools::GetFilenamePath(ctest.c_str()); ctest += "/"; @@ -402,7 +402,7 @@ void cmGlobalVisualStudio6Generator::SetupTests() if(!cmSystemTools::FileExists(ctest.c_str())) { ctest = - m_LocalGenerators[0]->GetMakefile()->GetDefinition("CMAKE_COMMAND"); + m_LocalGenerators[0]->GetMakefile()->GetRequiredDefinition("CMAKE_COMMAND"); ctest = cmSystemTools::GetFilenamePath(ctest.c_str()); ctest += "/Debug/"; ctest += "ctest"; @@ -411,7 +411,7 @@ void cmGlobalVisualStudio6Generator::SetupTests() if(!cmSystemTools::FileExists(ctest.c_str())) { ctest = - m_LocalGenerators[0]->GetMakefile()->GetDefinition("CMAKE_COMMAND"); + m_LocalGenerators[0]->GetMakefile()->GetRequiredDefinition("CMAKE_COMMAND"); ctest = cmSystemTools::GetFilenamePath(ctest.c_str()); ctest += "/Release/"; ctest += "ctest"; @@ -438,7 +438,7 @@ void cmGlobalVisualStudio6Generator::SetupTests() if(gen.size()) { gen[0]->GetMakefile()-> - AddUtilityCommand("RUN_TESTS", ctest.c_str(), "-D $(IntDir)",false,srcs); + AddUtilityCommand("RUN_TESTS", ctest.c_str(), "-C $(IntDir)",false,srcs); } } } diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx index b8fa1af..fc46ddb 100644 --- a/Source/cmGlobalVisualStudio7Generator.cxx +++ b/Source/cmGlobalVisualStudio7Generator.cxx @@ -122,7 +122,7 @@ cmLocalGenerator *cmGlobalVisualStudio7Generator::CreateLocalGenerator() void cmGlobalVisualStudio7Generator::SetupTests() { std::string ctest = - m_LocalGenerators[0]->GetMakefile()->GetDefinition("CMAKE_COMMAND"); + m_LocalGenerators[0]->GetMakefile()->GetRequiredDefinition("CMAKE_COMMAND"); ctest = cmSystemTools::GetFilenamePath(ctest.c_str()); ctest += "/"; ctest += "ctest"; @@ -130,7 +130,7 @@ void cmGlobalVisualStudio7Generator::SetupTests() if(!cmSystemTools::FileExists(ctest.c_str())) { ctest = - m_LocalGenerators[0]->GetMakefile()->GetDefinition("CMAKE_COMMAND"); + m_LocalGenerators[0]->GetMakefile()->GetRequiredDefinition("CMAKE_COMMAND"); ctest = cmSystemTools::GetFilenamePath(ctest.c_str()); ctest += "/Debug/"; ctest += "ctest"; @@ -139,7 +139,7 @@ void cmGlobalVisualStudio7Generator::SetupTests() if(!cmSystemTools::FileExists(ctest.c_str())) { ctest = - m_LocalGenerators[0]->GetMakefile()->GetDefinition("CMAKE_COMMAND"); + m_LocalGenerators[0]->GetMakefile()->GetRequiredDefinition("CMAKE_COMMAND"); ctest = cmSystemTools::GetFilenamePath(ctest.c_str()); ctest += "/Release/"; ctest += "ctest"; @@ -166,7 +166,7 @@ void cmGlobalVisualStudio7Generator::SetupTests() if(gen.size()) { gen[0]->GetMakefile()-> - AddUtilityCommand("RUN_TESTS", ctest.c_str(), "-D $(IntDir)",false,srcs); + AddUtilityCommand("RUN_TESTS", ctest.c_str(), "-C $(IntDir)",false,srcs); } } } @@ -258,7 +258,7 @@ void cmGlobalVisualStudio7Generator::Generate() gen[0]->GetMakefile()-> AddUtilityCommand("ALL_BUILD", "echo","\"Build all projects\"",false,srcs); std::string cmake_command = - m_LocalGenerators[0]->GetMakefile()->GetDefinition("CMAKE_COMMAND"); + m_LocalGenerators[0]->GetMakefile()->GetRequiredDefinition("CMAKE_COMMAND"); gen[0]->GetMakefile()-> AddUtilityCommand("INSTALL", cmake_command.c_str(), "-DBUILD_TYPE=$(IntDir) -P cmake_install.cmake",false,srcs); |