diff options
| author | Brad King <brad.king@kitware.com> | 2014-03-17 13:31:21 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-03-17 13:31:21 (GMT) |
| commit | 6e466c6f2ee5160202aaa76a9d643d34bd7d908a (patch) | |
| tree | 1117fe63347f333a4e20d1698cb791c6c3506e6a /Source/cmMakefileLibraryTargetGenerator.h | |
| parent | c903b5319bfcf383964c625bb84d7bc958aba2e9 (diff) | |
| parent | 6313be44aa465ea883e3578b3a0424ae0c217d5c (diff) | |
| download | CMake-6e466c6f2ee5160202aaa76a9d643d34bd7d908a.zip CMake-6e466c6f2ee5160202aaa76a9d643d34bd7d908a.tar.gz CMake-6e466c6f2ee5160202aaa76a9d643d34bd7d908a.tar.bz2 | |
Merge branch 'master' into CONFIG-LOCATION-CMP0026
Diffstat (limited to 'Source/cmMakefileLibraryTargetGenerator.h')
| -rw-r--r-- | Source/cmMakefileLibraryTargetGenerator.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmMakefileLibraryTargetGenerator.h b/Source/cmMakefileLibraryTargetGenerator.h index 1487b56..68980c3 100644 --- a/Source/cmMakefileLibraryTargetGenerator.h +++ b/Source/cmMakefileLibraryTargetGenerator.h @@ -30,7 +30,8 @@ protected: void WriteStaticLibraryRules(); void WriteSharedLibraryRules(bool relink); void WriteModuleLibraryRules(bool relink); - void WriteLibraryRules(const char *linkRule, const char *extraFlags, + void WriteLibraryRules(const std::string& linkRule, + const std::string& extraFlags, bool relink); // MacOSX Framework support methods void WriteFrameworkRules(bool relink); @@ -38,7 +39,7 @@ protected: // Store the computd framework version for OS X Frameworks. std::string FrameworkVersion; - void AppendOSXVerFlag(std::string& flags, const char* lang, + void AppendOSXVerFlag(std::string& flags, const std::string& lang, const char* name, bool so); }; |