From 2f5fdcf329dc97e65b05babdea8c9d90424610fa Mon Sep 17 00:00:00 2001 From: Simon Richter Date: Sat, 28 Apr 2018 21:56:48 +0200 Subject: [PATCH] Don't reference CMAKE_INSTALL_PREFIX in installation paths This is substituted at configuration time, creating an absolute path, which breaks overriding CMAKE_INSTALL_PREFIX at installation time, breaking the workflow for installation using GNU stow. --- CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1ef7c344dc..d74ac52fd7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -431,7 +431,7 @@ if( NOT APPLE ) else() # everything without leading / is relative to CMAKE_INSTALL_PREFIX. # CMAKE_INSTALL_PREFIX is root of .dmg image - set( KICAD_BIN ${CMAKE_INSTALL_PREFIX} + set( KICAD_BIN "." CACHE PATH "Location of KiCad binaries." FORCE ) # some paths to single app bundle @@ -861,25 +861,25 @@ if( UNIX AND NOT APPLE ) # Install Mime directory install( DIRECTORY ${UNIX_ICON_FILES} - DESTINATION ${CMAKE_INSTALL_PREFIX}/share + DESTINATION share COMPONENT resources ) # Install Icons install( DIRECTORY ${UNIX_MIME_FILES} - DESTINATION ${CMAKE_INSTALL_PREFIX}/share + DESTINATION share COMPONENT resources ) # Install Applications directory (.desktop files) install( DIRECTORY ${UNIX_APPLICATIONS_FILES} - DESTINATION ${CMAKE_INSTALL_PREFIX}/share + DESTINATION share COMPONENT resources ) # Install AppStream directory (app store entry) install( DIRECTORY ${UNIX_APPDATA_FILES} - DESTINATION ${CMAKE_INSTALL_PREFIX}/share + DESTINATION share COMPONENT resources ) endif()