summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalGenerator.cxx
diff options
context:
space:
mode:
authorBen Boeckel <ben.boeckel@kitware.com>2014-02-07 20:40:05 (GMT)
committerBrad King <brad.king@kitware.com>2014-03-08 18:05:33 (GMT)
commitc3833c7da40ccb03fc80bf10f37b77398d7123f8 (patch)
treec2ab4fd15ec826a258303f7a4852ef6fe285a664 /Source/cmGlobalGenerator.cxx
parentd76a6e08d06ef0fa6d52f67e88b0cfe4d96f24d1 (diff)
downloadCMake-c3833c7da40ccb03fc80bf10f37b77398d7123f8.zip
CMake-c3833c7da40ccb03fc80bf10f37b77398d7123f8.tar.gz
CMake-c3833c7da40ccb03fc80bf10f37b77398d7123f8.tar.bz2
stringapi: Use strings for VS project names
Diffstat (limited to 'Source/cmGlobalGenerator.cxx')
-rw-r--r--Source/cmGlobalGenerator.cxx11
1 files changed, 6 insertions, 5 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 795048b..ae9c731 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1007,7 +1007,7 @@ void cmGlobalGenerator::ClearEnabledLanguages()
this->LanguageEnabled.clear();
}
-bool cmGlobalGenerator::IsDependedOn(const char* project,
+bool cmGlobalGenerator::IsDependedOn(const std::string& project,
cmTarget const* targetIn)
{
// Get all local gens for this project
@@ -1615,7 +1615,7 @@ void cmGlobalGenerator::CheckLocalGenerators()
}
int cmGlobalGenerator::TryCompile(const char *srcdir, const char *bindir,
- const char *projectName,
+ const std::string& projectName,
const std::string& target, bool fast,
std::string *output, cmMakefile *mf)
{
@@ -1663,8 +1663,9 @@ int cmGlobalGenerator::TryCompile(const char *srcdir, const char *bindir,
}
void cmGlobalGenerator::GenerateBuildCommand(
- std::vector<std::string>& makeCommand, const char*, const char*, const char*,
- const std::string&, const char*, bool, std::vector<std::string> const&)
+ std::vector<std::string>& makeCommand, const char*, const std::string&,
+ const char*, const std::string&, const char*, bool,
+ std::vector<std::string> const&)
{
makeCommand.push_back(
"cmGlobalGenerator::GenerateBuildCommand not implemented");
@@ -1672,7 +1673,7 @@ void cmGlobalGenerator::GenerateBuildCommand(
int cmGlobalGenerator::Build(
const char *, const char *bindir,
- const char *projectName, const std::string& target,
+ const std::string& projectName, const std::string& target,
std::string *output,
const char *makeCommandCSTR,
const char *config,