napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: put completions with the other "misc. installs"

Browse Source
This commit is contained in:
Adriaan de Groot 2020-08-07 10:43:29 +02:00
parent 2ce12d5368
commit f324a055e5
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
CMakeLists.txt
View File

@ -455,14 +455,6 @@ list( SORT CALAMARES_TRANSLATION_LANGUAGES )
add_subdirectory( lang ) # i18n tools add_subdirectory( lang ) # i18n tools
if ( INSTALL_COMPLETION )
if( NOT CMAKE_INSTALL_BASHCOMPLETIONDIR )
set( CMAKE_INSTALL_BASHCOMPLETIONDIR "${CMAKE_INSTALL_DATADIR}/bash-completion/completions" )
endif()
install( FILES ${CMAKE_SOURCE_DIR}/data/completion/bash/calamares DESTINATION "${CMAKE_INSTALL_BASHCOMPLETIONDIR}" )
endif()
### Example Distro ### Example Distro
# #
# For testing purposes Calamares includes a very, very, limited sample # For testing purposes Calamares includes a very, very, limited sample
@ -652,6 +644,14 @@ if( INSTALL_POLKIT )
) )
endif() endif()
if ( INSTALL_COMPLETION )
if( NOT CMAKE_INSTALL_BASHCOMPLETIONDIR )
set( CMAKE_INSTALL_BASHCOMPLETIONDIR "${CMAKE_INSTALL_DATADIR}/bash-completion/completions" )
endif()
install( FILES ${CMAKE_SOURCE_DIR}/data/completion/bash/calamares DESTINATION "${CMAKE_INSTALL_BASHCOMPLETIONDIR}" )
endif()
install( install(
FILES calamares.desktop FILES calamares.desktop
DESTINATION ${CMAKE_INSTALL_DATADIR}/applications DESTINATION ${CMAKE_INSTALL_DATADIR}/applications