diff options
| author | Brad King <brad.king@kitware.com> | 2003-12-12 19:35:18 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2003-12-12 19:35:18 (GMT) |
| commit | c1add9106c5a382d3e668dc2ea99ccfd7163c96e (patch) | |
| tree | 9a90edcd50285f00cfc987eea75e8a34124ed119 /Source/cmLocalUnixMakefileGenerator.cxx | |
| parent | 9a096e8488e13021920f68ce69c38445c0487f44 (diff) | |
| download | CMake-c1add9106c5a382d3e668dc2ea99ccfd7163c96e.zip CMake-c1add9106c5a382d3e668dc2ea99ccfd7163c96e.tar.gz CMake-c1add9106c5a382d3e668dc2ea99ccfd7163c96e.tar.bz2 | |
ENH: Using separate CMAKE_SHARED_LIBRARY_SONAME flags for C and CXX.
Diffstat (limited to 'Source/cmLocalUnixMakefileGenerator.cxx')
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator.cxx b/Source/cmLocalUnixMakefileGenerator.cxx index d8e05ff..d656860 100644 --- a/Source/cmLocalUnixMakefileGenerator.cxx +++ b/Source/cmLocalUnixMakefileGenerator.cxx @@ -935,7 +935,8 @@ static RuleVariables ruleReplaceVars[] = {"<CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS>", "CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS"}, {"<CMAKE_SHARED_MODULE_CREATE_C_FLAGS>", "CMAKE_SHARED_MODULE_CREATE_C_FLAGS"}, - {"<CMAKE_SHARED_LIBRARY_SONAME_FLAG>", "CMAKE_SHARED_LIBRARY_SONAME_FLAG"}, + {"<CMAKE_SHARED_LIBRARY_SONAME_C_FLAG>", "CMAKE_SHARED_LIBRARY_SONAME_C_FLAG"}, + {"<CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG>", "CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG"}, {"<CMAKE_C_LINK_FLAGS>", "CMAKE_C_LINK_FLAGS"}, {"<CMAKE_AR>", "CMAKE_AR"}, @@ -1020,7 +1021,7 @@ cmLocalUnixMakefileGenerator::ExpandRuleVariables(std::string& s, } if(targetSOName) { - if(m_Makefile->GetDefinition("CMAKE_SHARED_LIBRARY_SONAME_FLAG")) + if(m_Makefile->GetDefinition("CMAKE_SHARED_LIBRARY_SONAME_C_FLAG")) { cmSystemTools::ReplaceString(s, "<TARGET_SONAME>", targetSOName); } @@ -3114,7 +3115,7 @@ void cmLocalUnixMakefileGenerator::GetLibraryNames(const char* n, const char* soversion = t.GetProperty("SOVERSION"); if((t.GetType() != cmTarget::SHARED_LIBRARY && t.GetType() != cmTarget::MODULE_LIBRARY) || - !m_Makefile->GetDefinition("CMAKE_SHARED_LIBRARY_SONAME_FLAG")) + !m_Makefile->GetDefinition("CMAKE_SHARED_LIBRARY_SONAME_C_FLAG")) { // Versioning is supported only for shared libraries and modules, // and then only when the platform supports an soname flag. |