diff options
| author | Ben Boeckel <ben.boeckel@kitware.com> | 2014-02-07 20:02:41 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-03-08 18:05:32 (GMT) |
| commit | 473ca1ac4a5df336ff09ee2c666e437eabf43bc9 (patch) | |
| tree | 1a98133fcda79243873ee7a8246b742097759cea /Source/CPack/cmCPackOSXX11Generator.cxx | |
| parent | a5996111164a4c4121e7d1fa08dbcd0983bb3589 (diff) | |
| download | CMake-473ca1ac4a5df336ff09ee2c666e437eabf43bc9.zip CMake-473ca1ac4a5df336ff09ee2c666e437eabf43bc9.tar.gz CMake-473ca1ac4a5df336ff09ee2c666e437eabf43bc9.tar.bz2 | |
stringapi: Use string for OS X resource names
Diffstat (limited to 'Source/CPack/cmCPackOSXX11Generator.cxx')
| -rw-r--r-- | Source/CPack/cmCPackOSXX11Generator.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/CPack/cmCPackOSXX11Generator.cxx b/Source/CPack/cmCPackOSXX11Generator.cxx index 76e15fb..95ffab5 100644 --- a/Source/CPack/cmCPackOSXX11Generator.cxx +++ b/Source/CPack/cmCPackOSXX11Generator.cxx @@ -227,7 +227,7 @@ int cmCPackOSXX11Generator::InitializeInternal() //---------------------------------------------------------------------- /* -bool cmCPackOSXX11Generator::CopyCreateResourceFile(const char* name) +bool cmCPackOSXX11Generator::CopyCreateResourceFile(const std::string& name) { std::string uname = cmSystemTools::UpperCase(name); std::string cpackVar = "CPACK_RESOURCE_FILE_" + uname; @@ -271,7 +271,7 @@ bool cmCPackOSXX11Generator::CopyCreateResourceFile(const char* name) */ //---------------------------------------------------------------------- -bool cmCPackOSXX11Generator::CopyResourcePlistFile(const char* name, +bool cmCPackOSXX11Generator::CopyResourcePlistFile(const std::string& name, const char* dir, const char* outputFileName /* = 0 */, bool copyOnly /* = false */) { @@ -288,7 +288,7 @@ bool cmCPackOSXX11Generator::CopyResourcePlistFile(const char* name, if ( !outputFileName ) { - outputFileName = name; + outputFileName = name.c_str(); } std::string destFileName = dir; |