From 8b16a124d5645100fcadd279d24bf44fa43b1252 Mon Sep 17 00:00:00 2001 From: Simon Wells Date: Mon, 12 Sep 2016 21:52:47 +1200 Subject: [PATCH] Removed KICAD_DATA dir which is redundant on OSX and changed the prefix to something more sane --- CMakeLists.txt | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f627152c..5efda882 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,14 +5,11 @@ cmake_minimum_required( VERSION 2.6.1 FATAL_ERROR ) # Locations for install targets. if( APPLE ) # Like all variables, CMAKE_INSTALL_PREFIX can be over-ridden on the command line. - set( CMAKE_INSTALL_PREFIX / - CACHE PATH "" ) + set( CMAKE_INSTALL_PREFIX "/Library/Application Support/kicad/" CACHE PATH "" ) # Everything without leading / is relative to CMAKE_INSTALL_PREFIX. - set( KICAD_DATA "Library/Application Support/kicad/" - CACHE PATH "Location of KiCad data files." ) - set( KICAD_MODULES ${KICAD_DATA}/modules ) - set( KICAD_LIBRARY ${KICAD_DATA}/library ) - set( KICAD_TEMPLATE ${KICAD_DATA}/template ) + set( KICAD_MODULES modules ) + set( KICAD_LIBRARY library ) + set( KICAD_TEMPLATE template ) else() # Everything without leading / is relative to CMAKE_INSTALL_PREFIX. set( KICAD_DATA share/kicad