Skip to content

Commit cca1428

Browse files
authored
Merge pull request #183 from tstenner/lslauxfiles
Install aux files to /usr/share on linux
2 parents dc7e38c + a5145ad commit cca1428

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

cmake/LSLCMake.cmake

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,8 @@ function(installLSLAuxFiles target)
7373
get_target_property(is_bundle ${target} MACOSX_BUNDLE)
7474
set(destdir ${PROJECT_NAME})
7575
if(LSL_UNIXFOLDERS)
76-
set(destdir bin/)
76+
include(GNUInstallDirs)
77+
set(destdir "${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}")
7778
elseif(is_bundle AND APPLE)
7879
set(destdir ${destdir}/${target}.app/Contents/MacOS)
7980
endif()
@@ -305,9 +306,8 @@ macro(LSLGenerateCPackConfig)
305306
elseif(UNIX)
306307
set(LSL_CPACK_DEFAULT_GEN DEB)
307308
set(LSL_OS "Linux")
308-
set(CPACK_SET_DESTDIR 1)
309-
set(CPACK_INSTALL_PREFIX "/usr")
310309
set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Tristan Stenner <ttstenner@gmail.com>")
310+
311311
set(CPACK_DEBIAN_ENABLE_COMPONENT_DEPENDS ON)
312312
set(CPACK_DEB_COMPONENT_INSTALL ON)
313313
set(CPACK_DEBIAN_PACKAGE_PRIORITY optional)
@@ -321,7 +321,7 @@ macro(LSLGenerateCPackConfig)
321321
OUTPUT_STRIP_TRAILING_WHITESPACE
322322
RESULT_VARIABLE LSB_RELEASE_RESULT
323323
)
324-
if(LSB_RELEASE_CODENAME)
324+
if(LSB_RELEASE_CODENAME AND NOT LSB_RELEASE_CODENAME STREQUAL "n/a")
325325
set(CPACK_DEBIAN_PACKAGE_RELEASE ${LSB_RELEASE_CODENAME})
326326
set(LSL_OS "${LSB_RELEASE_CODENAME}")
327327
endif()

0 commit comments

Comments
 (0)