mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-24 01:54:22 +00:00
Code Activity

CLion: Fixed an issue when linking shared library code with spaces in the library name

Browse source
This commit is contained in:
tpoole 2017-10-20 09:34:01 +01:00
parent 52afdcb2ff
commit 73573ede91
1 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

21
extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_CLion.h
View file

@ -754,16 +754,19 @@ private:
out << ")" << newLine << newLine;
String linkerFlags;
StringArray linkerFlags;
if (targetAttributeKeys.contains ("OTHER_LDFLAGS"))
{
// CMake adds its own SHARED_CODE library linking flags
linkerFlags = targetAttributes["OTHER_LDFLAGS"]
.unquoted()
.replace ("-bundle", {})
.replace ("-l" + binaryName, {})
.trim();
auto flagsWithReplacedSpaces = targetAttributes["OTHER_LDFLAGS"].unquoted().replace ("\\\\ ", "^^%%^^");
linkerFlags.addTokens (flagsWithReplacedSpaces, true);
linkerFlags.removeString ("-bundle");
linkerFlags.removeString ("-l" + binaryName.replace (" ", "^^%%^^"));
for (auto& flag : linkerFlags)
flag = flag.replace ("^^%%^^", " ");
targetAttributeKeys.removeString ("OTHER_LDFLAGS");
}
@ -886,10 +889,10 @@ private:
out << " SHARED_CODE" << newLine;
for (auto& path : libSearchPaths)
out << " -L" << path.quoted() << newLine;
out << " \"-L" << path << "\"" << newLine;
if (linkerFlags.isNotEmpty())
out << " " << linkerFlags << newLine;
for (auto& flag : linkerFlags)
out << " " << flag.quoted() << newLine;
for (auto& framework : target->frameworkNames)
out << " \"-framework " << framework << "\"" << newLine;