applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-07-02 11:55:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'install-bits'

Browse source 
FIXES #729
This commit is contained in:
Adriaan de Groot 2018-02-21 10:15:58 -05:00
commit 36ef4556b4
5 changed files with 37 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/calamares/CMakeLists.txt
View file

@ -18,10 +18,6 @@ set( calamaresSources
progresstree/ViewStepItem.cpp
)
set( calamaresUi
#nothing to do here
)
include_directories(
.
${CMAKE_CURRENT_BINARY_DIR}
@ -33,16 +29,14 @@ include_directories(
include( GNUInstallDirs )
qt5_wrap_ui( calamaresUi_H ${calamaresUi} )
# Translations
include( CalamaresAddTranslations )
add_calamares_translations( ${CALAMARES_TRANSLATION_LANGUAGES} )
set( final_src ${calamaresUi_H} ${calamaresSources} ${calamaresRc} ${trans_outfile} )
set( final_src ${calamaresSources} ${calamaresRc} ${trans_outfile} )
add_executable( calamares_bin ${final_src} )
SET_TARGET_PROPERTIES(calamares_bin
set_target_properties(calamares_bin
PROPERTIES
AUTOMOC TRUE
ENABLE_EXPORTS TRUE

10
src/libcalamares/CMakeLists.txt
View file

@ -83,8 +83,6 @@ add_library( calamares SHARED ${libSources} ${kdsagSources} ${utilsSources} )
set_target_properties( calamares
PROPERTIES
AUTOMOC TRUE
VERSION ${CALAMARES_VERSION_SHORT}
SOVERSION ${CALAMARES_VERSION_SHORT}
)
target_link_libraries( calamares
@ -94,18 +92,10 @@ target_link_libraries( calamares
install( TARGETS calamares
EXPORT CalamaresLibraryDepends
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
)
# 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
file( GLOB rootHeaders "*.h" )
file( GLOB kdsingleapplicationguardHeaders "kdsingleapplicationguard/*.h" )

2
src/libcalamaresui/CMakeLists.txt
View file

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