From d4393b28131448ef7128f7ef04bffc4c3336bbe6 Mon Sep 17 00:00:00 2001 From: Jean-Samuel Reynaud Date: Mon, 28 May 2018 09:15:35 +0200 Subject: [PATCH] Fix incorrect Eeschema BOM plugins install path on Linux. Fixes lp:1697041 https://bugs.launchpad.net/kicad/+bug/1697041 --- CMakeLists.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c9d86b9c23..6c52528fb5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -410,6 +410,9 @@ if( NOT APPLE ) set( KICAD_BIN bin CACHE PATH "Location of KiCad binaries." ) + set( KICAD_DATA ${CMAKE_INSTALL_DATADIR}/kicad + CACHE PATH "Location of KiCad data files." ) + if( WIN32 ) set( KICAD_PLUGINS ${KICAD_BIN}/scripting/plugins CACHE PATH "Location of KiCad plugins." ) @@ -420,7 +423,7 @@ if( NOT APPLE ) set( KICAD_USER_PLUGIN ${KICAD_BIN}/plugins CACHE PATH "Location of KiCad user-loaded plugins" ) else() - set( KICAD_PLUGINS ${CMAKE_INSTALL_LIBDIR}/kicad/plugins + set( KICAD_PLUGINS ${KICAD_DATA}/plugins CACHE PATH "Location of KiCad plugins." ) set( KICAD_LIB ${CMAKE_INSTALL_LIBDIR} @@ -430,8 +433,6 @@ if( NOT APPLE ) CACHE PATH "Location of KiCad user-loaded plugins" ) endif() - set( KICAD_DATA ${CMAKE_INSTALL_DATADIR}/kicad - CACHE PATH "Location of KiCad data files." ) set( KICAD_DOCS ${CMAKE_INSTALL_DATADIR}/doc/kicad CACHE PATH "Location of KiCad documentation files." ) set( KICAD_DEMOS ${KICAD_DATA}/demos