diff options
| author | Saleem Abdulrasool <compnerd@compnerd.org> | 2019-01-31 23:39:44 (GMT) |
|---|---|---|
| committer | Saleem Abdulrasool <compnerd@compnerd.org> | 2019-02-13 17:25:29 (GMT) |
| commit | 157570b5a2d3135e2d83f9bd2865ad666a709499 (patch) | |
| tree | 879769f432d9dd8f0a9786db6612ac334b1018b3 /Source | |
| parent | 63efce507bfcf7eec1dbcb10acadeb3304d6f20d (diff) | |
| download | CMake-157570b5a2d3135e2d83f9bd2865ad666a709499.zip CMake-157570b5a2d3135e2d83f9bd2865ad666a709499.tar.gz CMake-157570b5a2d3135e2d83f9bd2865ad666a709499.tar.bz2 | |
Add placeholder for Swift's library name
This allows us to set the proper link name for the Swift library
(soname). Because this needs to be passed to the object being compiled,
we need to create a new placeholder so that it can be sent along to the
frontend. Default to the target name unless it is explicitly provided.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmNinjaTargetGenerator.cxx | 5 | ||||
| -rw-r--r-- | Source/cmRulePlaceholderExpander.cxx | 5 | ||||
| -rw-r--r-- | Source/cmRulePlaceholderExpander.h | 1 |
3 files changed, 11 insertions, 0 deletions
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx index b525dac..df6428f 100644 --- a/Source/cmNinjaTargetGenerator.cxx +++ b/Source/cmNinjaTargetGenerator.cxx @@ -454,6 +454,7 @@ void cmNinjaTargetGenerator::WriteCompileRule(const std::string& lang) if (lang == "Swift") { vars.SwiftAuxiliarySources = "$SWIFT_AUXILIARY_SOURCES"; vars.SwiftModuleName = "$SWIFT_MODULE_NAME"; + vars.SwiftLibraryName = "$SWIFT_LIBRARY_NAME"; } // For some cases we do an explicit preprocessor invocation. @@ -940,6 +941,10 @@ void cmNinjaTargetGenerator::WriteObjectBuildStatement( } else { vars["SWIFT_MODULE_NAME"] = this->GeneratorTarget->GetName(); } + + cmGeneratorTarget::Names targetNames = + this->GeneratorTarget->GetLibraryNames(this->GetConfigName()); + vars["SWIFT_LIBRARY_NAME"] = targetNames.Base; } if (!this->NeedDepTypeMSVC(language)) { diff --git a/Source/cmRulePlaceholderExpander.cxx b/Source/cmRulePlaceholderExpander.cxx index e347a2c..5ebdd1b 100644 --- a/Source/cmRulePlaceholderExpander.cxx +++ b/Source/cmRulePlaceholderExpander.cxx @@ -172,6 +172,11 @@ std::string cmRulePlaceholderExpander::ExpandRuleVariable( return replaceValues.SwiftModuleName; } } + if (replaceValues.SwiftLibraryName) { + if (variable == "SWIFT_LIBRARY_NAME") { + return replaceValues.SwiftLibraryName; + } + } if (variable == "TARGET_SONAME" || variable == "SONAME_FLAG" || variable == "TARGET_INSTALLNAME_DIR") { // All these variables depend on TargetSOName diff --git a/Source/cmRulePlaceholderExpander.h b/Source/cmRulePlaceholderExpander.h index 5c03637..930eafd 100644 --- a/Source/cmRulePlaceholderExpander.h +++ b/Source/cmRulePlaceholderExpander.h @@ -60,6 +60,7 @@ public: const char* FilterPrefix; const char* SwiftAuxiliarySources; const char* SwiftModuleName; + const char* SwiftLibraryName; }; // Expand rule variables in CMake of the type found in language rules |