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

minor bug

Browse Source
This commit is contained in:
Ken Martin 2002-08-21 13:16:07 -04:00
parent 96f8d18f8d
commit 9f870d3efb
3 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Source/cmCPluginAPI.cxx
View File

@ -70,27 +70,27 @@ void cmAddCacheDefinition(void *arg, const char* name, const char* value,
{ {
case CM_CACHE_BOOL: case CM_CACHE_BOOL:
mf->AddCacheDefinition(name,value,doc, mf->AddCacheDefinition(name,value,doc,
cmCacheManager::CacheEntryType::BOOL); cmCacheManager::BOOL);
break; break;
case CM_CACHE_PATH: case CM_CACHE_PATH:
mf->AddCacheDefinition(name,value,doc, mf->AddCacheDefinition(name,value,doc,
cmCacheManager::CacheEntryType::PATH); cmCacheManager::PATH);
break; break;
case CM_CACHE_FILEPATH: case CM_CACHE_FILEPATH:
mf->AddCacheDefinition(name,value,doc, mf->AddCacheDefinition(name,value,doc,
cmCacheManager::CacheEntryType::FILEPATH); cmCacheManager::FILEPATH);
break; break;
case CM_CACHE_STRING: case CM_CACHE_STRING:
mf->AddCacheDefinition(name,value,doc, mf->AddCacheDefinition(name,value,doc,
cmCacheManager::CacheEntryType::STRING); cmCacheManager::STRING);
break; break;
case CM_CACHE_INTERNAL: case CM_CACHE_INTERNAL:
mf->AddCacheDefinition(name,value,doc, mf->AddCacheDefinition(name,value,doc,
cmCacheManager::CacheEntryType::INTERNAL); cmCacheManager::INTERNAL);
break; break;
case CM_CACHE_STATIC: case CM_CACHE_STATIC:
mf->AddCacheDefinition(name,value,doc, mf->AddCacheDefinition(name,value,doc,
cmCacheManager::CacheEntryType::STATIC); cmCacheManager::STATIC);
break; break;
} }
} }
@ -236,16 +236,13 @@ void cmAddLinkLibraryForTarget(void *arg, const char *tgt, const char*value,
switch (libtype) switch (libtype)
{ {
case CM_LIBRARY_GENERAL: case CM_LIBRARY_GENERAL:
mf->AddLinkLibraryForTarget(tgt,value, mf->AddLinkLibraryForTarget(tgt,value, cmTarget::GENERAL);
cmTarget::LinkLibraryType::GENERAL);
break; break;
case CM_LIBRARY_DEBUG: case CM_LIBRARY_DEBUG:
mf->AddLinkLibraryForTarget(tgt,value, mf->AddLinkLibraryForTarget(tgt,value, cmTarget::DEBUG);
cmTarget::LinkLibraryType::DEBUG);
break; break;
case CM_LIBRARY_OPTIMIZED: case CM_LIBRARY_OPTIMIZED:
mf->AddLinkLibraryForTarget(tgt,value, mf->AddLinkLibraryForTarget(tgt,value, cmTarget::OPTIMIZED);
cmTarget::LinkLibraryType::OPTIMIZED);
break; break;
} }
} }
@ -267,8 +264,9 @@ char *cmExpandVariablesInString(void *arg, const char *source,
int escapeQuotes, int atOnly) int escapeQuotes, int atOnly)
{ {
cmMakefile *mf = static_cast<cmMakefile *>(arg); cmMakefile *mf = static_cast<cmMakefile *>(arg);
std::string barf = source;
std::string result = std::string result =
mf->ExpandVariablesInString(std::string(source), mf->ExpandVariablesInString(barf,
(escapeQuotes ? true : false), (escapeQuotes ? true : false),
(atOnly ? true : false)); (atOnly ? true : false));
char *res = static_cast<char *>(malloc(result.size() + 1)); char *res = static_cast<char *>(malloc(result.size() + 1));

2
Source/cmMakefile.cxx
View File

@ -190,7 +190,7 @@ bool cmMakefile::CommandExists(const char* name) const
return (m_Commands.find(name) != m_Commands.end()); 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) std::vector<std::string> const& arguments)
{ {
// quick return if blocked // quick return if blocked

2
Source/cmMakefile.h
View File

@ -500,7 +500,7 @@ public:
/** /**
* execute a single CMake command * 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. */ /** Check if a command exists. */
bool CommandExists(const char* name) const; bool CommandExists(const char* name) const;