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

ENH: change RUN_TESTS to use -C and not -D also use GetRequiredDefinition where needed

Browse Source
This commit is contained in:
Bill Hoffman 2004-08-11 16:57:27 -04:00
parent 2a1bbabb6b
commit bb32a51825
2 changed files with 11 additions and 11 deletions

12
Source/cmGlobalVisualStudio6Generator.cxx

@ -36,7 +36,7 @@ void cmGlobalVisualStudio6Generator::EnableLanguage(const char* lang,
void cmGlobalVisualStudio6Generator::GenerateConfigurations(cmMakefile* mf) 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"); const char* def= mf->GetDefinition( "MSPROJECT_TEMPLATE_DIRECTORY");
if(def) if(def)
{ {
@ -172,7 +172,7 @@ void cmGlobalVisualStudio6Generator::Generate()
gen[0]->GetMakefile()-> gen[0]->GetMakefile()->
AddUtilityCommand("ALL_BUILD", "echo","\"Build all projects\"",false,srcs); AddUtilityCommand("ALL_BUILD", "echo","\"Build all projects\"",false,srcs);
std::string cmake_command = std::string cmake_command =
m_LocalGenerators[0]->GetMakefile()->GetDefinition("CMAKE_COMMAND"); m_LocalGenerators[0]->GetMakefile()->GetRequiredDefinition("CMAKE_COMMAND");
gen[0]->GetMakefile()-> gen[0]->GetMakefile()->
AddUtilityCommand("INSTALL", cmake_command.c_str(), AddUtilityCommand("INSTALL", cmake_command.c_str(),
"-DBUILD_TYPE=$(IntDir) -P cmake_install.cmake",false,srcs); "-DBUILD_TYPE=$(IntDir) -P cmake_install.cmake",false,srcs);
@ -393,7 +393,7 @@ inline std::string removeQuotes(const std::string& s)
void cmGlobalVisualStudio6Generator::SetupTests() void cmGlobalVisualStudio6Generator::SetupTests()
{ {
std::string ctest = std::string ctest =
m_LocalGenerators[0]->GetMakefile()->GetDefinition("CMAKE_COMMAND"); m_LocalGenerators[0]->GetMakefile()->GetRequiredDefinition("CMAKE_COMMAND");
ctest = removeQuotes(ctest); ctest = removeQuotes(ctest);
ctest = cmSystemTools::GetFilenamePath(ctest.c_str()); ctest = cmSystemTools::GetFilenamePath(ctest.c_str());
ctest += "/"; ctest += "/";
@ -402,7 +402,7 @@ void cmGlobalVisualStudio6Generator::SetupTests()
if(!cmSystemTools::FileExists(ctest.c_str())) if(!cmSystemTools::FileExists(ctest.c_str()))
{ {
ctest = ctest =
m_LocalGenerators[0]->GetMakefile()->GetDefinition("CMAKE_COMMAND"); m_LocalGenerators[0]->GetMakefile()->GetRequiredDefinition("CMAKE_COMMAND");
ctest = cmSystemTools::GetFilenamePath(ctest.c_str()); ctest = cmSystemTools::GetFilenamePath(ctest.c_str());
ctest += "/Debug/"; ctest += "/Debug/";
ctest += "ctest"; ctest += "ctest";
@ -411,7 +411,7 @@ void cmGlobalVisualStudio6Generator::SetupTests()
if(!cmSystemTools::FileExists(ctest.c_str())) if(!cmSystemTools::FileExists(ctest.c_str()))
{ {
ctest = ctest =
m_LocalGenerators[0]->GetMakefile()->GetDefinition("CMAKE_COMMAND"); m_LocalGenerators[0]->GetMakefile()->GetRequiredDefinition("CMAKE_COMMAND");
ctest = cmSystemTools::GetFilenamePath(ctest.c_str()); ctest = cmSystemTools::GetFilenamePath(ctest.c_str());
ctest += "/Release/"; ctest += "/Release/";
ctest += "ctest"; ctest += "ctest";
@ -438,7 +438,7 @@ void cmGlobalVisualStudio6Generator::SetupTests()
if(gen.size()) if(gen.size())
{ {
gen[0]->GetMakefile()-> gen[0]->GetMakefile()->
AddUtilityCommand("RUN_TESTS", ctest.c_str(), "-D $(IntDir)",false,srcs); AddUtilityCommand("RUN_TESTS", ctest.c_str(), "-C $(IntDir)",false,srcs);
} }
} }
} }

10
Source/cmGlobalVisualStudio7Generator.cxx

@ -122,7 +122,7 @@ cmLocalGenerator *cmGlobalVisualStudio7Generator::CreateLocalGenerator()
void cmGlobalVisualStudio7Generator::SetupTests() void cmGlobalVisualStudio7Generator::SetupTests()
{ {
std::string ctest = std::string ctest =
m_LocalGenerators[0]->GetMakefile()->GetDefinition("CMAKE_COMMAND"); m_LocalGenerators[0]->GetMakefile()->GetRequiredDefinition("CMAKE_COMMAND");
ctest = cmSystemTools::GetFilenamePath(ctest.c_str()); ctest = cmSystemTools::GetFilenamePath(ctest.c_str());
ctest += "/"; ctest += "/";
ctest += "ctest"; ctest += "ctest";
@ -130,7 +130,7 @@ void cmGlobalVisualStudio7Generator::SetupTests()
if(!cmSystemTools::FileExists(ctest.c_str())) if(!cmSystemTools::FileExists(ctest.c_str()))
{ {
ctest = ctest =
m_LocalGenerators[0]->GetMakefile()->GetDefinition("CMAKE_COMMAND"); m_LocalGenerators[0]->GetMakefile()->GetRequiredDefinition("CMAKE_COMMAND");
ctest = cmSystemTools::GetFilenamePath(ctest.c_str()); ctest = cmSystemTools::GetFilenamePath(ctest.c_str());
ctest += "/Debug/"; ctest += "/Debug/";
ctest += "ctest"; ctest += "ctest";
@ -139,7 +139,7 @@ void cmGlobalVisualStudio7Generator::SetupTests()
if(!cmSystemTools::FileExists(ctest.c_str())) if(!cmSystemTools::FileExists(ctest.c_str()))
{ {
ctest = ctest =
m_LocalGenerators[0]->GetMakefile()->GetDefinition("CMAKE_COMMAND"); m_LocalGenerators[0]->GetMakefile()->GetRequiredDefinition("CMAKE_COMMAND");
ctest = cmSystemTools::GetFilenamePath(ctest.c_str()); ctest = cmSystemTools::GetFilenamePath(ctest.c_str());
ctest += "/Release/"; ctest += "/Release/";
ctest += "ctest"; ctest += "ctest";
@ -166,7 +166,7 @@ void cmGlobalVisualStudio7Generator::SetupTests()
if(gen.size()) if(gen.size())
{ {
gen[0]->GetMakefile()-> 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()-> gen[0]->GetMakefile()->
AddUtilityCommand("ALL_BUILD", "echo","\"Build all projects\"",false,srcs); AddUtilityCommand("ALL_BUILD", "echo","\"Build all projects\"",false,srcs);
std::string cmake_command = std::string cmake_command =
m_LocalGenerators[0]->GetMakefile()->GetDefinition("CMAKE_COMMAND"); m_LocalGenerators[0]->GetMakefile()->GetRequiredDefinition("CMAKE_COMMAND");
gen[0]->GetMakefile()-> gen[0]->GetMakefile()->
AddUtilityCommand("INSTALL", cmake_command.c_str(), AddUtilityCommand("INSTALL", cmake_command.c_str(),
"-DBUILD_TYPE=$(IntDir) -P cmake_install.cmake",false,srcs); "-DBUILD_TYPE=$(IntDir) -P cmake_install.cmake",false,srcs);