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

Clion: Added a global path to the CLion exe

Browse source
This commit is contained in:
tpoole 2017-11-03 18:32:07 +00:00
parent d4a7afa73f
commit a75f023ca5
4 changed files with 88 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

35
extras/Projucer/Source/Settings/jucer_StoredSettings.cpp
View file

@ -295,7 +295,7 @@ Value StoredSettings::getFallbackPathForOS (const Identifier& key, DependencyPat
else if (key == Ids::aaxPath)
{
if (os == TargetOS::windows) v = "C:\\SDKs\\AAX";
else if (os == TargetOS::osx) v = "~/SDKs/AAX" ;
else if (os == TargetOS::osx) v = "~/SDKs/AAX";
else jassertfalse; // no AAX on this OS!
}
else if (key == Ids::androidSDKPath)
@ -306,6 +306,29 @@ Value StoredSettings::getFallbackPathForOS (const Identifier& key, DependencyPat
{
v = "${user.home}/Library/Android/sdk/ndk-bundle";
}
else if (key == Ids::clionExePath)
{
if (os == TargetOS::windows)
{
#if JUCE_WINDOWS
auto regValue = WindowsRegistry::getValue ("HKEY_LOCAL_MACHINE\\SOFTWARE\\Classes\\Applications\\clion64.exe\\shell\\open\\command\\", {}, {});
auto openCmd = StringArray::fromTokens (regValue, true);
if (! openCmd.isEmpty())
return Value (openCmd[0].unquoted());
#endif
v = "C:\\Program Files\\JetBrains\\CLion YYYY.MM.DD\\bin\\clion64.exe";
}
else if (os == TargetOS::osx)
{
v = "/Applications/CLion.app";
}
else
{
v = "${user.home}/clion/bin/clion.sh";
}
}
}
return v;
@ -357,6 +380,16 @@ bool StoredSettings::isGlobalPathValid (const File& relativeTo, const Identifier
{
fileToCheckFor = {};
}
else if (key == Ids::clionExePath)
{
#if JUCE_MAC
fileToCheckFor = path.trim().endsWith (".app") ? "Contents/MacOS/clion" : "../clion";
#elif JUCE_WIDOWS
fileToCheckFor = "../clion64.exe";
#else
fileToCheckFor = "../clion.sh";
#endif
}
else
{
// didn't recognise the key provided!