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

CMake: try installing outside of regular lib/

Browse Source 
- Install unversioned libraries
 - Install to lib/calamares instead of directly to lib/
This commit is contained in:
Adriaan de Groot 2018-02-13 10:26:04 -05:00
parent 958aee1d41
commit 83639b182b
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/libcalamares/CMakeLists.txt
View File

@ -83,8 +83,6 @@ add_library( calamares SHARED ${libSources} ${kdsagSources} ${utilsSources} )
set_target_properties( calamares set_target_properties( calamares
PROPERTIES PROPERTIES
AUTOMOC TRUE AUTOMOC TRUE
VERSION ${CALAMARES_VERSION_SHORT}
SOVERSION ${CALAMARES_VERSION_SHORT}
) )
target_link_libraries( calamares target_link_libraries( calamares
@ -95,17 +93,10 @@ target_link_libraries( calamares
install( TARGETS calamares install( TARGETS calamares
EXPORT CalamaresLibraryDepends EXPORT CalamaresLibraryDepends
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} 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/
) )
# Make symlink lib/calamares/libcalamares.so to lib/libcalamares.so.VERSION so
# lib/calamares can be used as module path for the Python interpreter.
install( CODE "
file( MAKE_DIRECTORY \"\$ENV{DESTDIR}/${CMAKE_INSTALL_FULL_LIBDIR}/calamares\" )
execute_process( COMMAND \"${CMAKE_COMMAND}\" -E create_symlink ../libcalamares.so.${CALAMARES_VERSION_SHORT} libcalamares.so WORKING_DIRECTORY \"\$ENV{DESTDIR}/${CMAKE_INSTALL_FULL_LIBDIR}/calamares\" )
")
# Install header files # Install header files
file( GLOB rootHeaders "*.h" ) file( GLOB rootHeaders "*.h" )
file( GLOB kdsingleapplicationguardHeaders "kdsingleapplicationguard/*.h" ) file( GLOB kdsingleapplicationguardHeaders "kdsingleapplicationguard/*.h" )

3
src/libcalamaresui/CMakeLists.txt
View File

@ -78,5 +78,6 @@ calamares_add_library( calamaresui
Qt5::QuickWidgets Qt5::QuickWidgets
RESOURCES libcalamaresui.qrc RESOURCES libcalamaresui.qrc
EXPORT CalamaresLibraryDepends EXPORT CalamaresLibraryDepends
VERSION ${CALAMARES_VERSION_SHORT} NO_VERSION
INSTALL_BINDIR ${CMAKE_INSTALL_LIBDIR}/calamares/
) )