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

Fix incorrect Eeschema BOM plugins install path on Linux. 

Fixes lp:1697041

https://bugs.launchpad.net/kicad/+bug/1697041
This commit is contained in:
Jean-Samuel Reynaud 2018-05-28 09:15:35 +02:00 committed by Wayne Stambaugh
parent 8f984c2899
commit d4393b2813
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -410,6 +410,9 @@ if( NOT APPLE )
set( KICAD_BIN bin set( KICAD_BIN bin
CACHE PATH "Location of KiCad binaries." ) CACHE PATH "Location of KiCad binaries." )
set( KICAD_DATA ${CMAKE_INSTALL_DATADIR}/kicad
CACHE PATH "Location of KiCad data files." )
if( WIN32 ) if( WIN32 )
set( KICAD_PLUGINS ${KICAD_BIN}/scripting/plugins set( KICAD_PLUGINS ${KICAD_BIN}/scripting/plugins
CACHE PATH "Location of KiCad plugins." ) CACHE PATH "Location of KiCad plugins." )
@ -420,7 +423,7 @@ if( NOT APPLE )
set( KICAD_USER_PLUGIN ${KICAD_BIN}/plugins set( KICAD_USER_PLUGIN ${KICAD_BIN}/plugins
CACHE PATH "Location of KiCad user-loaded plugins" ) CACHE PATH "Location of KiCad user-loaded plugins" )
else() else()
set( KICAD_PLUGINS ${CMAKE_INSTALL_LIBDIR}/kicad/plugins set( KICAD_PLUGINS ${KICAD_DATA}/plugins
CACHE PATH "Location of KiCad plugins." ) CACHE PATH "Location of KiCad plugins." )
set( KICAD_LIB ${CMAKE_INSTALL_LIBDIR} set( KICAD_LIB ${CMAKE_INSTALL_LIBDIR}
@ -430,8 +433,6 @@ if( NOT APPLE )
CACHE PATH "Location of KiCad user-loaded plugins" ) CACHE PATH "Location of KiCad user-loaded plugins" )
endif() endif()
set( KICAD_DATA ${CMAKE_INSTALL_DATADIR}/kicad
CACHE PATH "Location of KiCad data files." )
set( KICAD_DOCS ${CMAKE_INSTALL_DATADIR}/doc/kicad set( KICAD_DOCS ${CMAKE_INSTALL_DATADIR}/doc/kicad
CACHE PATH "Location of KiCad documentation files." ) CACHE PATH "Location of KiCad documentation files." )
set( KICAD_DEMOS ${KICAD_DATA}/demos set( KICAD_DEMOS ${KICAD_DATA}/demos