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

Remove redundant data in defines. 

* Using CMAKE_INSTALL_PREFIX in KICAD_* install paths is redundant,
  because they are allready relative to CMAKE_INSTALL_PREFIX when no
  absolute path is given.
  Using an absolute path makes it harder to change the install
  path on the fly, without either rebuilding, or manually editing
  CMakeCache.txt

Signed-off-by: Niki Guldbrand <niki.guldbrand@gmail.com>
This commit is contained in:
Niki Guldbrand 2016-09-13 22:29:02 +02:00 committed by Wayne Stambaugh
parent 6689c7e75e
commit c689c8cc3f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -329,7 +329,7 @@ set( KIFACE_PREFIX "_" )
#================================================ #================================================
if( NOT APPLE ) if( NOT APPLE )
# Everything without leading / is relative to CMAKE_INSTALL_PREFIX. # Everything without leading / is relative to CMAKE_INSTALL_PREFIX.
set( KICAD_BIN ${CMAKE_INSTALL_PREFIX}/bin set( KICAD_BIN bin
CACHE PATH "Location of KiCad binaries." ) CACHE PATH "Location of KiCad binaries." )
if( WIN32 ) if( WIN32 )
@ -345,10 +345,10 @@ if( NOT APPLE )
set( KICAD_PLUGINS lib/kicad/plugins set( KICAD_PLUGINS lib/kicad/plugins
CACHE PATH "Location of KiCad plugins." ) CACHE PATH "Location of KiCad plugins." )
set( KICAD_LIB ${CMAKE_INSTALL_PREFIX}/lib set( KICAD_LIB lib
CACHE PATH "Location of KiCad shared objects" ) CACHE PATH "Location of KiCad shared objects" )
set( KICAD_USER_PLUGIN ${CMAKE_INSTALL_PREFIX}/lib/kicad/plugins set( KICAD_USER_PLUGIN lib/kicad/plugins
CACHE PATH "Location of KiCad user-loaded plugins" ) CACHE PATH "Location of KiCad user-loaded plugins" )
endif() endif()