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

cmake: use GNUInstallDirs to obtain lib/lib64 path 

Fixes lp:1679795

https://bugs.launchpad.net/kicad/+bug/1679795
This commit is contained in:
Vlad Ivanov 2017-04-05 21:10:20 +03:00 committed by Wayne Stambaugh
parent e6545ec982
commit 1e25c47362
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -31,6 +31,8 @@ endif()
project( kicad ) project( kicad )
include( GNUInstallDirs )
cmake_minimum_required( VERSION 2.8.12 FATAL_ERROR ) cmake_minimum_required( VERSION 2.8.12 FATAL_ERROR )
# because of http://public.kitware.com/Bug/view.php?id=10395 # because of http://public.kitware.com/Bug/view.php?id=10395
@ -364,13 +366,13 @@ 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 lib/kicad/plugins set( KICAD_PLUGINS ${CMAKE_INSTALL_LIBDIR}/kicad/plugins
CACHE PATH "Location of KiCad plugins." ) CACHE PATH "Location of KiCad plugins." )
set( KICAD_LIB lib set( KICAD_LIB ${CMAKE_INSTALL_LIBDIR}
CACHE PATH "Location of KiCad shared objects" ) CACHE PATH "Location of KiCad shared objects" )
set( KICAD_USER_PLUGIN lib/kicad/plugins set( KICAD_USER_PLUGIN ${CMAKE_INSTALL_LIBDIR}/kicad/plugins
CACHE PATH "Location of KiCad user-loaded plugins" ) CACHE PATH "Location of KiCad user-loaded plugins" )
endif() endif()