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

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.
This commit is contained in:
Simon Richter 2018-04-28 21:56:48 +02:00 committed by Wayne Stambaugh
parent 5ac4dbe641
commit 2f5fdcf329
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -431,7 +431,7 @@ if( NOT APPLE )
else() else()
# everything without leading / is relative to CMAKE_INSTALL_PREFIX. # everything without leading / is relative to CMAKE_INSTALL_PREFIX.
# CMAKE_INSTALL_PREFIX is root of .dmg image # CMAKE_INSTALL_PREFIX is root of .dmg image
set( KICAD_BIN ${CMAKE_INSTALL_PREFIX} set( KICAD_BIN "."
CACHE PATH "Location of KiCad binaries." FORCE ) CACHE PATH "Location of KiCad binaries." FORCE )
# some paths to single app bundle # some paths to single app bundle
@ -861,25 +861,25 @@ if( UNIX AND NOT APPLE )
# Install Mime directory # Install Mime directory
install( DIRECTORY ${UNIX_ICON_FILES} install( DIRECTORY ${UNIX_ICON_FILES}
DESTINATION ${CMAKE_INSTALL_PREFIX}/share DESTINATION share
COMPONENT resources COMPONENT resources
) )
# Install Icons # Install Icons
install( DIRECTORY ${UNIX_MIME_FILES} install( DIRECTORY ${UNIX_MIME_FILES}
DESTINATION ${CMAKE_INSTALL_PREFIX}/share DESTINATION share
COMPONENT resources COMPONENT resources
) )
# Install Applications directory (.desktop files) # Install Applications directory (.desktop files)
install( DIRECTORY ${UNIX_APPLICATIONS_FILES} install( DIRECTORY ${UNIX_APPLICATIONS_FILES}
DESTINATION ${CMAKE_INSTALL_PREFIX}/share DESTINATION share
COMPONENT resources COMPONENT resources
) )
# Install AppStream directory (app store entry) # Install AppStream directory (app store entry)
install( DIRECTORY ${UNIX_APPDATA_FILES} install( DIRECTORY ${UNIX_APPDATA_FILES}
DESTINATION ${CMAKE_INSTALL_PREFIX}/share DESTINATION share
COMPONENT resources COMPONENT resources
) )
endif() endif()