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

Fix plugin install libdir.

Browse Source
This commit is contained in:
Teo Mrnjavac 2014-07-01 11:16:03 +02:00
parent 5dc5b4ddc8
commit f417b22fc3
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
CalamaresAddLibrary.cmake
View File

@ -10,13 +10,13 @@ function(calamares_add_library)
set(LIBRARY_NAME ${NAME}) set(LIBRARY_NAME ${NAME})
# message("*** Arguments for ${LIBRARY_NAME}") # message("*** Arguments for ${LIBRARY_NAME}")
# message("Sources: ${LIBRARY_SOURCES}") # message("Sources: ${LIBRARY_SOURCES}")
# message("Link libraries: ${LIBRARY_LINK_LIBRARIES}") # message("Link libraries: ${LIBRARY_LINK_LIBRARIES}")
# message("UI: ${LIBRARY_UI}") # message("UI: ${LIBRARY_UI}")
# message("TARGET_TYPE: ${LIBRARY_TARGET_TYPE}") # message("TARGET_TYPE: ${LIBRARY_TARGET_TYPE}")
# message("EXPORT_MACRO: ${LIBRARY_EXPORT_MACRO}") # message("EXPORT_MACRO: ${LIBRARY_EXPORT_MACRO}")
# message("NO_INSTALL: ${LIBRARY_NO_INSTALL}") # message("NO_INSTALL: ${LIBRARY_NO_INSTALL}")
set(target ${LIBRARY_NAME}) set(target ${LIBRARY_NAME})
@ -89,23 +89,29 @@ function(calamares_add_library)
if(NOT LIBRARY_INSTALL_BINDIR) if(NOT LIBRARY_INSTALL_BINDIR)
set(LIBRARY_INSTALL_BINDIR "${CMAKE_INSTALL_BINDIR}") set(LIBRARY_INSTALL_BINDIR "${CMAKE_INSTALL_BINDIR}")
set(LIBRARY_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}")
else()
set(LIBRARY_INSTALL_LIBDIR "${LIBRARY_INSTALL_BINDIR}")
endif() endif()
message("INSTALL_BINDIR: ${LIBRARY_INSTALL_BINDIR}")
message("INSTALL_LIBDIR: ${LIBRARY_INSTALL_LIBDIR}")
# make installation optional, maybe useful for dummy plugins one day # make installation optional, maybe useful for dummy plugins one day
if(NOT LIBRARY_NO_INSTALL) if(NOT LIBRARY_NO_INSTALL)
include(GNUInstallDirs) include(GNUInstallDirs)
if(NOT LIBRARY_EXPORT) if(NOT LIBRARY_EXPORT)
install( TARGETS ${target} install( TARGETS ${target}
RUNTIME DESTINATION ${LIBRARY_INSTALL_BINDIR} RUNTIME DESTINATION ${LIBRARY_INSTALL_BINDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${LIBRARY_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${LIBRARY_INSTALL_LIBDIR}
) )
else() else()
install( TARGETS ${target} install( TARGETS ${target}
EXPORT ${LIBRARY_EXPORT} EXPORT ${LIBRARY_EXPORT}
RUNTIME DESTINATION ${LIBRARY_INSTALL_BINDIR} RUNTIME DESTINATION ${LIBRARY_INSTALL_BINDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${LIBRARY_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${LIBRARY_INSTALL_LIBDIR}
) )
endif() endif()
endif() endif()