CMake: tidy misc. installation bits

- don't generate uninstall file twice
- tighten up vertical space
This commit is contained in:
Adriaan de Groot 2020-06-10 01:42:11 +02:00
parent a62d96f555
commit 9039e15bdf

View File

@ -523,13 +523,6 @@ endif()
# make predefined install dirs available everywhere # make predefined install dirs available everywhere
include( GNUInstallDirs ) include( GNUInstallDirs )
# make uninstall support
configure_file(
"${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
IMMEDIATE @ONLY
)
# This is used by CalamaresAddLibrary; once Calamares is installed, # This is used by CalamaresAddLibrary; once Calamares is installed,
# the CalamaresConfig.cmake module sets this variable to the IMPORTED # the CalamaresConfig.cmake module sets this variable to the IMPORTED
# libraries for Calamares. # libraries for Calamares.
@ -592,36 +585,31 @@ install(
"${CMAKE_INSTALL_CMAKEDIR}" "${CMAKE_INSTALL_CMAKEDIR}"
) )
### Miscellaneous installs
#
#
if( INSTALL_CONFIG ) if( INSTALL_CONFIG )
install( install(
FILES FILES settings.conf
settings.conf DESTINATIONshare/calamares
DESTINATION
share/calamares
) )
endif() endif()
if( INSTALL_POLKIT ) if( INSTALL_POLKIT )
install( install(
FILES FILES com.github.calamares.calamares.policy
com.github.calamares.calamares.policy DESTINATION "${POLKITQT-1_POLICY_FILES_INSTALL_DIR}"
DESTINATION
"${POLKITQT-1_POLICY_FILES_INSTALL_DIR}"
) )
endif() endif()
install( install(
FILES FILES calamares.desktop
calamares.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications
DESTINATION
${CMAKE_INSTALL_DATADIR}/applications
) )
install( install(
FILES FILES man/calamares.8
man/calamares.8 DESTINATION ${CMAKE_INSTALL_MANDIR}/man8/
DESTINATION
${CMAKE_INSTALL_MANDIR}/man8/
) )
# uninstall target # uninstall target