haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Mac and Linux stock plugins paths

This commit is contained in:
Jon Evans 2021-02-26 19:00:39 -05:00
parent 75c525af4f
commit e4ef531f7d
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/paths.cpp
View File

@ -167,15 +167,14 @@ wxString PATHS::GetStockPluginsPath()
wxFileName fn; wxFileName fn;
#if defined( __WXMAC__ ) #if defined( __WXMAC__ )
fn.Assign( Pgm().GetExecutablePath() ); fn.Assign( PATHS::GetOSXKicadDataDir() );
fn.AppendDir( wxT( "Contents" ) ); fn.AppendDir( wxT( "plugins" ) );
fn.AppendDir( wxT( "PlugIns" ) );
#elif defined( __WXMSW__ ) #elif defined( __WXMSW__ )
fn.Assign( Pgm().GetExecutablePath() + wxT( "/plugins/" ) ); fn.Assign( Pgm().GetExecutablePath() + wxT( "/plugins/" ) );
#else #else
// PLUGINDIR = CMAKE_INSTALL_FULL_LIBDIR path is the absolute path // PLUGINDIR = CMAKE_INSTALL_FULL_LIBDIR path is the absolute path
// corresponding to the install path used for constructing KICAD_USER_PLUGIN // corresponding to the install path used for constructing KICAD_USER_PLUGIN
wxString tfname = wxString::FromUTF8Unchecked( KICAD_PLUGINDIR ); wxString tfname = wxString::FromUTF8Unchecked( KICAD_DATA );
fn.Assign( tfname, "" ); fn.Assign( tfname, "" );
fn.AppendDir( "kicad" ); // linux use lowercase fn.AppendDir( "kicad" ); // linux use lowercase
fn.AppendDir( wxT( "plugins" ) ); fn.AppendDir( wxT( "plugins" ) );
@ -286,4 +285,4 @@ wxString PATHS::GetOSXKicadDataDir()
return ddir.GetPath(); return ddir.GetPath();
} }
#endif #endif