Skip to content

Commit

Permalink
Merge pull request #183 from tstenner/lslauxfiles
Browse files Browse the repository at this point in the history
Install aux files to /usr/share on linux
  • Loading branch information
cboulay authored Feb 13, 2023
2 parents dc7e38c + a5145ad commit cca1428
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions cmake/LSLCMake.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@ function(installLSLAuxFiles target)
get_target_property(is_bundle ${target} MACOSX_BUNDLE)
set(destdir ${PROJECT_NAME})
if(LSL_UNIXFOLDERS)
set(destdir bin/)
include(GNUInstallDirs)
set(destdir "${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}")
elseif(is_bundle AND APPLE)
set(destdir ${destdir}/${target}.app/Contents/MacOS)
endif()
Expand Down Expand Up @@ -305,9 +306,8 @@ macro(LSLGenerateCPackConfig)
elseif(UNIX)
set(LSL_CPACK_DEFAULT_GEN DEB)
set(LSL_OS "Linux")
set(CPACK_SET_DESTDIR 1)
set(CPACK_INSTALL_PREFIX "/usr")
set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Tristan Stenner <ttstenner@gmail.com>")

set(CPACK_DEBIAN_ENABLE_COMPONENT_DEPENDS ON)
set(CPACK_DEB_COMPONENT_INSTALL ON)
set(CPACK_DEBIAN_PACKAGE_PRIORITY optional)
Expand All @@ -321,7 +321,7 @@ macro(LSLGenerateCPackConfig)
OUTPUT_STRIP_TRAILING_WHITESPACE
RESULT_VARIABLE LSB_RELEASE_RESULT
)
if(LSB_RELEASE_CODENAME)
if(LSB_RELEASE_CODENAME AND NOT LSB_RELEASE_CODENAME STREQUAL "n/a")
set(CPACK_DEBIAN_PACKAGE_RELEASE ${LSB_RELEASE_CODENAME})
set(LSL_OS "${LSB_RELEASE_CODENAME}")
endif()
Expand Down

0 comments on commit cca1428

Please sign in to comment.