applications/calamares
3
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-02-24 19:05:46 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

CMake: just install unversioned .so

Browse source 
- Applies to libcalamares and libcalamaresui.so, install with no
   version, just the bare .so. Since Calamares doesn't do versioning
   anyway, and its plugins should be re-compiled for any change,
   putting them in lib as unversioned .so's should make Calamares
   happy and silence lintian.
This commit is contained in:
Adriaan de Groot 2018-02-19 04:23:56 -05:00
parent f047b0b110
commit db0c1ffd6d
3 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/calamares/CMakeLists.txt
View file

@ -42,7 +42,7 @@ add_calamares_translations( ${CALAMARES_TRANSLATION_LANGUAGES} )
set( final_src ${calamaresUi_H} ${calamaresSources} ${calamaresRc} ${trans_outfile} ) set( final_src ${calamaresUi_H} ${calamaresSources} ${calamaresRc} ${trans_outfile} )
add_executable( calamares_bin ${final_src} ) add_executable( calamares_bin ${final_src} )
SET_TARGET_PROPERTIES(calamares_bin set_target_properties(calamares_bin
PROPERTIES PROPERTIES
AUTOMOC TRUE AUTOMOC TRUE
ENABLE_EXPORTS TRUE ENABLE_EXPORTS TRUE

5
src/libcalamares/CMakeLists.txt
View file

@ -92,9 +92,8 @@ target_link_libraries( calamares
install( TARGETS calamares install( TARGETS calamares
EXPORT CalamaresLibraryDepends EXPORT CalamaresLibraryDepends
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/calamares/ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/calamares/
) )
# Install header files # Install header files

1
src/libcalamaresui/CMakeLists.txt
View file

@ -79,5 +79,4 @@ calamares_add_library( calamaresui
RESOURCES libcalamaresui.qrc RESOURCES libcalamaresui.qrc
EXPORT CalamaresLibraryDepends EXPORT CalamaresLibraryDepends
NO_VERSION NO_VERSION
INSTALL_BINDIR ${CMAKE_INSTALL_LIBDIR}/calamares/
) )