← Back to branch summary

~azzar1/unity/fix-trash-li-blocking

« back to all changes in this revision

Viewing changes to services/CMakeLists.txt

  • Committer: Marco Trevisan (Treviño)
  • Date: 2016-02-09 01:26:22 UTC
  • mto: This revision was merged to the branch mainline in revision 4072.
  • Revision ID: mail@3v1n0.net-20160209012622-yl9ejwxx1dbk3uzv
CMake: use GNUInstallDirs with native multi-arch support

We can now use CMAKE_INSTALL_*DIR instead of defining them manually.
Also disable networkarea region plugin build by default.

Show diffs side-by-side

added added

removed removed

Lines of Context:
services/CMakeLists.txt
51
51
 
52
52
add_executable(unity-panel-service ${PANEL_SOURCES})
53
53
target_link_libraries(unity-panel-service ${LIBS})
54
 
install(TARGETS unity-panel-service DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/unity/)
 
54
install(TARGETS unity-panel-service DESTINATION ${CMAKE_INSTALL_LIBDIR}/unity/)
55
55
 
56
56
configure_file(unity-panel-service.conf.in ${CMAKE_CURRENT_BINARY_DIR}/unity-panel-service.conf)
57
 
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unity-panel-service.conf DESTINATION ${CMAKE_INSTALL_PREFIX}/share/upstart/sessions)
 
57
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unity-panel-service.conf DESTINATION ${CMAKE_INSTALL_DATADIR}/upstart/sessions)
58
58
 
59
59
configure_file(unity-panel-service-lockscreen.conf.in ${CMAKE_CURRENT_BINARY_DIR}/unity-panel-service-lockscreen.conf)
60
 
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unity-panel-service-lockscreen.conf DESTINATION ${CMAKE_INSTALL_PREFIX}/share/upstart/sessions)
 
60
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unity-panel-service-lockscreen.conf DESTINATION ${CMAKE_INSTALL_DATADIR}/upstart/sessions)