Commit 9f870d3e authored by Ken Martin's avatar Ken Martin
Browse files

minor bug

parent 96f8d18f
......@@ -70,27 +70,27 @@ void cmAddCacheDefinition(void *arg, const char* name, const char* value,
{
case CM_CACHE_BOOL:
mf->AddCacheDefinition(name,value,doc,
cmCacheManager::CacheEntryType::BOOL);
cmCacheManager::BOOL);
break;
case CM_CACHE_PATH:
mf->AddCacheDefinition(name,value,doc,
cmCacheManager::CacheEntryType::PATH);
cmCacheManager::PATH);
break;
case CM_CACHE_FILEPATH:
mf->AddCacheDefinition(name,value,doc,
cmCacheManager::CacheEntryType::FILEPATH);
cmCacheManager::FILEPATH);
break;
case CM_CACHE_STRING:
mf->AddCacheDefinition(name,value,doc,
cmCacheManager::CacheEntryType::STRING);
cmCacheManager::STRING);
break;
case CM_CACHE_INTERNAL:
mf->AddCacheDefinition(name,value,doc,
cmCacheManager::CacheEntryType::INTERNAL);
cmCacheManager::INTERNAL);
break;
case CM_CACHE_STATIC:
mf->AddCacheDefinition(name,value,doc,
cmCacheManager::CacheEntryType::STATIC);
cmCacheManager::STATIC);
break;
}
}
......@@ -236,16 +236,13 @@ void cmAddLinkLibraryForTarget(void *arg, const char *tgt, const char*value,
switch (libtype)
{
case CM_LIBRARY_GENERAL:
mf->AddLinkLibraryForTarget(tgt,value,
cmTarget::LinkLibraryType::GENERAL);
mf->AddLinkLibraryForTarget(tgt,value, cmTarget::GENERAL);
break;
case CM_LIBRARY_DEBUG:
mf->AddLinkLibraryForTarget(tgt,value,
cmTarget::LinkLibraryType::DEBUG);
mf->AddLinkLibraryForTarget(tgt,value, cmTarget::DEBUG);
break;
case CM_LIBRARY_OPTIMIZED:
mf->AddLinkLibraryForTarget(tgt,value,
cmTarget::LinkLibraryType::OPTIMIZED);
mf->AddLinkLibraryForTarget(tgt,value, cmTarget::OPTIMIZED);
break;
}
}
......@@ -267,8 +264,9 @@ char *cmExpandVariablesInString(void *arg, const char *source,
int escapeQuotes, int atOnly)
{
cmMakefile *mf = static_cast<cmMakefile *>(arg);
std::string barf = source;
std::string result =
mf->ExpandVariablesInString(std::string(source),
mf->ExpandVariablesInString(barf,
(escapeQuotes ? true : false),
(atOnly ? true : false));
char *res = static_cast<char *>(malloc(result.size() + 1));
......
......@@ -190,7 +190,7 @@ bool cmMakefile::CommandExists(const char* name) const
return (m_Commands.find(name) != m_Commands.end());
}
void cmMakefile::ExecuteCommand(std::string &name,
void cmMakefile::ExecuteCommand(std::string const &name,
std::vector<std::string> const& arguments)
{
// quick return if blocked
......
......@@ -500,7 +500,7 @@ public:
/**
* execute a single CMake command
*/
void ExecuteCommand(std::string &name, std::vector<std::string> const& args);
void ExecuteCommand(std::string const &name, std::vector<std::string> const& args);
/** Check if a command exists. */
bool CommandExists(const char* name) const;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment