summaryrefslogtreecommitdiffstats
path: root/Source/cmMakefile.cxx
diff options
context:
space:
mode:
authorDavid Cole <david.cole@kitware.com>2012-06-21 15:55:15 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2012-06-21 15:55:15 (GMT)
commitae6f9b015f0e2ed30934b756d8cf3b268cda6472 (patch)
treebaaa51a8d615f8d49eff22bc64256a439b5967df /Source/cmMakefile.cxx
parent4870918c483f1d6fd75e627ed86558373962d584 (diff)
parent56148fd2bc5ddbf32b89bbf94034ea4b14c6716d (diff)
downloadCMake-ae6f9b015f0e2ed30934b756d8cf3b268cda6472.zip
CMake-ae6f9b015f0e2ed30934b756d8cf3b268cda6472.tar.gz
CMake-ae6f9b015f0e2ed30934b756d8cf3b268cda6472.tar.bz2
Merge topic 'module-no-soname'
56148fd Do not crash on SHARED library without language (#13324)
Diffstat (limited to 'Source/cmMakefile.cxx')
-rw-r--r--Source/cmMakefile.cxx8
1 files changed, 6 insertions, 2 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index a60896f..7b6c450 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2203,8 +2203,12 @@ bool cmMakefile::PlatformIs64Bit() const
const char* cmMakefile::GetSONameFlag(const char* language) const
{
- std::string name = "CMAKE_SHARED_LIBRARY_SONAME_";
- name += language;
+ std::string name = "CMAKE_SHARED_LIBRARY_SONAME";
+ if(language)
+ {
+ name += "_";
+ name += language;
+ }
name += "_FLAG";
return GetDefinition(name.c_str());
}