From f6f43d052b76278cc77858380c209f6c0b8a6775 Mon Sep 17 00:00:00 2001 From: Konstantin Pugin Date: Fri, 24 Apr 2015 23:08:35 +0600 Subject: [PATCH] CPack initial work --- CMakeLists.txt | 36 +++++++++++++++++++++++-- app/CMakeLists.txt | 2 +- applets/core/clock/CMakeLists.txt | 4 +-- applets/core/dirmenu/CMakeLists.txt | 4 +-- applets/core/kbled/CMakeLists.txt | 8 +++--- applets/core/launchbar/CMakeLists.txt | 8 +++--- applets/core/menumodel/CMakeLists.txt | 8 +++--- applets/core/separator/CMakeLists.txt | 4 +-- applets/drawing/cpu/CMakeLists.txt | 4 +-- applets/wnck/deskno/CMakeLists.txt | 4 +-- applets/wnck/pager/CMakeLists.txt | 4 +-- applets/wnck/tasklist/CMakeLists.txt | 4 +-- applets/wnck/wincmd/CMakeLists.txt | 4 +-- applets/wnck/xembed/CMakeLists.txt | 4 +-- cmake | 2 +- data/gschemas/CMakeLists.txt | 12 ++++----- data/images/CMakeLists.txt | 4 +-- data/profiles/appmenu/CMakeLists.txt | 4 +-- data/profiles/default/CMakeLists.txt | 4 +-- data/profiles/two_panels/CMakeLists.txt | 6 ++--- lib/CMakeLists.txt | 10 +++---- po/CMakeLists.txt | 2 +- 22 files changed, 87 insertions(+), 55 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d5f34548..9caf5813 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_policy (VERSION 2.8) project (vala-panel) enable_testing () include(GNUInstallDirs) -SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") +SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}") set (DATADIR "${CMAKE_INSTALL_FULL_DATADIR}/vala-panel") set (PKGDATADIR "${DATADIR}") set (GETTEXT_PACKAGE "vala-panel") @@ -35,13 +35,45 @@ set(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") # Add 'make dist' command for creating release tarball set (CPACK_PACKAGE_VERSION ${VERSION}) +set (CPACK_PACKAGE_VERSION_MAJOR "${VERSION_MAJOR}") +set (CPACK_PACKAGE_VERSION_MINOR "${VERSION_MINOR}") +set (CPACK_PACKAGE_VERSION_PATCH "${VERSION_PATCH}") set (CPACK_SOURCE_GENERATOR "TGZ") set (CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION}") set (CPACK_SOURCE_IGNORE_FILES "/build/;/.git/;/.gitignore;/.gitmodules;~$;${CPACK_SOURCE_IGNORE_FILES}") +# Variables for CPack binary packages +set (CPACK_PACKAGE_NAME ${CMAKE_PROJECT_NAME}) +set (CPACK_PACKAGE_RELEASE "1") +set (CPACK_PACKAGE_CONTACT "Konstantin P. ") +set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "Vala Panel is GTK+ 3 desktop panel. It is based on Vala and some LXPanel ideas.") +set (CPACK_PACKAGE_DESCRIPTION "Vala Panel is GTK+ 3 desktop panel. It is based on Vala and LXPanel ideas.\nIn fact, it was be a fork of LXPanel in version 0.1.0, but in 0.2.0 it completery rewritten in Vala.\nIt offers same functionality as LXPanel, but:\n1. It has slightly more memory usage\n2. X11 dependency is stripped from panel core (but it is not tested on Wayland right now)\n3. Some of former LXPanel plugins is separate binaries now, and lives in another packages.") +set (CPACK_COMPONENTS_ALL "bin;dev;plugins-base;plugins-wnck") +set (CPACK_COMPONENT_dev_DEPENDS "bin") +set (CPACK_COMPONENT_plugins-base_DEPENDS "bin") +set (CPACK_COMPONENT_plugins-wnck_DEPENDS "bin") + +# Variables and functions for building deb packages +set (CPACK_DEB_COMPONENT_INSTALL ON) +set (CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON) +set (CPACK_DEBIAN_PACKAGE_SECTION "x11") +set (CPACK_DEBIAN_PACKAGE_REVISION ${CPACK_PACKAGE_RELEASE}) +string(TOLOWER "${CPACK_PACKAGE_NAME}" CPACK_PACKAGE_NAME_LOWERCASE) +find_program(DPKG_PROGRAM dpkg DOC "dpkg program of Debian-based systems") +if(DPKG_PROGRAM) + execute_process(COMMAND ${DPKG_PROGRAM} --print-architecture + OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE + OUTPUT_STRIP_TRAILING_WHITESPACE) + set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME_LOWERCASE}-${VERSION}-${CPACK_DEBIAN_PACKAGE_REVISION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}") +else(DPKG_PROGRAM) + set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME_LOWERCASE}-${VERSION}-${CPACK_DEBIAN_PACKAGE_REVISION}_${CMAKE_SYSTEM_NAME}") +endif(DPKG_PROGRAM) + +# Add 'make packages' command for building Debian and RPM packages +set (CPACK_GENERATOR "RPM") include (CPack) -add_custom_target (dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source) +add_custom_target (dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source) # Configuration configure_file (${CMAKE_SOURCE_DIR}/vapi/config.vala.in ${CMAKE_BINARY_DIR}/vapi/config.vala) configure_file (${CMAKE_SOURCE_DIR}/${APPNAME}.pc.cmake ${CMAKE_BINARY_DIR}/${APPNAME}.pc) diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index d3669e68..5664ac6b 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -29,4 +29,4 @@ glib_compile_resources(GLIB_RESOURCES_APP add_executable (${APPNAME} ${VALA_C} ${GLIB_RESOURCES_APP}) target_link_libraries (${APPNAME} ${LIBNAME}) -install (TARGETS ${APPNAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +install (TARGETS ${APPNAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT bin) diff --git a/applets/core/clock/CMakeLists.txt b/applets/core/clock/CMakeLists.txt index ee2bf183..c48af965 100644 --- a/applets/core/clock/CMakeLists.txt +++ b/applets/core/clock/CMakeLists.txt @@ -29,5 +29,5 @@ add_library (${PLUGIN_NAME} MODULE target_link_libraries (${PLUGIN_NAME} ${LIBS} valapanel) # Install plugin stuffs -install(TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGINS_DIRECTORY}) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_NAME}.plugin DESTINATION ${PLUGINS_DIRECTORY}) +install(TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGINS_DIRECTORY} COMPONENT plugins-base) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_NAME}.plugin DESTINATION ${PLUGINS_DIRECTORY} COMPONENT plugins-base) diff --git a/applets/core/dirmenu/CMakeLists.txt b/applets/core/dirmenu/CMakeLists.txt index 943fc0f2..efc2f021 100644 --- a/applets/core/dirmenu/CMakeLists.txt +++ b/applets/core/dirmenu/CMakeLists.txt @@ -30,5 +30,5 @@ add_library (${PLUGIN_NAME} MODULE target_link_libraries (${PLUGIN_NAME} ${LIBS} valapanel) # Install plugin stuffs -install(TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGINS_DIRECTORY}) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_NAME}.plugin DESTINATION ${PLUGINS_DIRECTORY}) +install(TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGINS_DIRECTORY} COMPONENT plugins-base) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_NAME}.plugin DESTINATION ${PLUGINS_DIRECTORY} COMPONENT plugins-base) diff --git a/applets/core/kbled/CMakeLists.txt b/applets/core/kbled/CMakeLists.txt index 45097b36..8bab3fc7 100644 --- a/applets/core/kbled/CMakeLists.txt +++ b/applets/core/kbled/CMakeLists.txt @@ -17,8 +17,8 @@ OPTIONS ##### INCLUDE(GResource) glib_compile_resources(RESOURCES - source - ${PLUGIN_NAME}.gresource.xml + source + ${PLUGIN_NAME}.gresource.xml ) # Build library for plugin @@ -34,5 +34,5 @@ add_library (${PLUGIN_NAME} MODULE target_link_libraries (${PLUGIN_NAME} ${LIBS} valapanel) # Install plugin stuffs -install(TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGINS_DIRECTORY}) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_NAME}.plugin DESTINATION ${PLUGINS_DIRECTORY}) +install(TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGINS_DIRECTORY} COMPONENT plugins-base) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_NAME}.plugin DESTINATION ${PLUGINS_DIRECTORY} COMPONENT plugins-base) diff --git a/applets/core/launchbar/CMakeLists.txt b/applets/core/launchbar/CMakeLists.txt index 1e6d287c..1e2e7754 100644 --- a/applets/core/launchbar/CMakeLists.txt +++ b/applets/core/launchbar/CMakeLists.txt @@ -17,8 +17,8 @@ OPTIONS ##### INCLUDE(GResource) glib_compile_resources(RESOURCES - source - ${PLUGIN_NAME}.gresource.xml + source + ${PLUGIN_NAME}.gresource.xml ) # Build library for plugin @@ -34,5 +34,5 @@ add_library (${PLUGIN_NAME} MODULE target_link_libraries (${PLUGIN_NAME} ${LIBS} valapanel) # Install plugin stuffs -install(TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGINS_DIRECTORY}) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_NAME}.plugin DESTINATION ${PLUGINS_DIRECTORY}) +install(TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGINS_DIRECTORY} COMPONENT plugins-base) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_NAME}.plugin DESTINATION ${PLUGINS_DIRECTORY} COMPONENT plugins-base) diff --git a/applets/core/menumodel/CMakeLists.txt b/applets/core/menumodel/CMakeLists.txt index 5f15f118..d2c23f07 100644 --- a/applets/core/menumodel/CMakeLists.txt +++ b/applets/core/menumodel/CMakeLists.txt @@ -18,8 +18,8 @@ OPTIONS ##### INCLUDE(GResource) glib_compile_resources(RESOURCES - source - ${PLUGIN_NAME}.gresource.xml + source + ${PLUGIN_NAME}.gresource.xml ) # Build library for plugin @@ -35,5 +35,5 @@ add_library (${PLUGIN_NAME} MODULE target_link_libraries (${PLUGIN_NAME} ${LIBS} valapanel) # Install plugin stuffs -install(TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGINS_DIRECTORY}) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_NAME}.plugin DESTINATION ${PLUGINS_DIRECTORY}) +install(TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGINS_DIRECTORY} COMPONENT plugins-base) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_NAME}.plugin DESTINATION ${PLUGINS_DIRECTORY} COMPONENT plugins-base) diff --git a/applets/core/separator/CMakeLists.txt b/applets/core/separator/CMakeLists.txt index ee79f14e..0db02e99 100644 --- a/applets/core/separator/CMakeLists.txt +++ b/applets/core/separator/CMakeLists.txt @@ -28,5 +28,5 @@ add_library (${PLUGIN_NAME} MODULE target_link_libraries (${PLUGIN_NAME} ${LIBS} valapanel) # Install plugin stuffs -install(TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGINS_DIRECTORY}) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_NAME}.plugin DESTINATION ${PLUGINS_DIRECTORY}) +install(TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGINS_DIRECTORY} COMPONENT plugins-base) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_NAME}.plugin DESTINATION ${PLUGINS_DIRECTORY} COMPONENT plugins-base) diff --git a/applets/drawing/cpu/CMakeLists.txt b/applets/drawing/cpu/CMakeLists.txt index 455b9aa5..4d6d774d 100644 --- a/applets/drawing/cpu/CMakeLists.txt +++ b/applets/drawing/cpu/CMakeLists.txt @@ -31,5 +31,5 @@ target_link_libraries (${PLUGIN_NAME} ${LIBS} valapanel) target_include_directories (${PLUGIN_NAME} PRIVATE ${LIB_PATHS}) # Install plugin stuffs -install(TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGINS_DIRECTORY}) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_NAME}.plugin DESTINATION ${PLUGINS_DIRECTORY}) +install(TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGINS_DIRECTORY} COMPONENT plugins-base) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_NAME}.plugin DESTINATION ${PLUGINS_DIRECTORY} COMPONENT plugins-base) diff --git a/applets/wnck/deskno/CMakeLists.txt b/applets/wnck/deskno/CMakeLists.txt index 69dbb258..00018c8b 100644 --- a/applets/wnck/deskno/CMakeLists.txt +++ b/applets/wnck/deskno/CMakeLists.txt @@ -32,5 +32,5 @@ target_link_libraries (${PLUGIN_NAME} ${LIBS} valapanel) target_include_directories (${PLUGIN_NAME} PRIVATE ${LIB_PATHS}) # Install plugin stuffs -install(TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGINS_DIRECTORY}) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_NAME}.plugin DESTINATION ${PLUGINS_DIRECTORY}) +install(TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGINS_DIRECTORY} COMPONENT plugins-wnck) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_NAME}.plugin DESTINATION ${PLUGINS_DIRECTORY} COMPONENT plugins-wnck) diff --git a/applets/wnck/pager/CMakeLists.txt b/applets/wnck/pager/CMakeLists.txt index 500ab4c6..91191a5d 100644 --- a/applets/wnck/pager/CMakeLists.txt +++ b/applets/wnck/pager/CMakeLists.txt @@ -32,5 +32,5 @@ target_link_libraries (${PLUGIN_NAME} ${LIBS} valapanel) target_include_directories (${PLUGIN_NAME} PRIVATE ${LIB_PATHS}) # Install plugin stuffs -install(TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGINS_DIRECTORY}) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_NAME}.plugin DESTINATION ${PLUGINS_DIRECTORY}) +install(TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGINS_DIRECTORY} COMPONENT plugins-wnck) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_NAME}.plugin DESTINATION ${PLUGINS_DIRECTORY} COMPONENT plugins-wnck) diff --git a/applets/wnck/tasklist/CMakeLists.txt b/applets/wnck/tasklist/CMakeLists.txt index 0321e524..d3cddfd1 100644 --- a/applets/wnck/tasklist/CMakeLists.txt +++ b/applets/wnck/tasklist/CMakeLists.txt @@ -31,5 +31,5 @@ target_link_libraries (${PLUGIN_NAME} ${LIBS} valapanel) target_include_directories (${PLUGIN_NAME} PRIVATE ${LIB_PATHS}) # Install plugin stuffs -install(TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGINS_DIRECTORY}) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_NAME}.plugin DESTINATION ${PLUGINS_DIRECTORY}) +install(TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGINS_DIRECTORY} COMPONENT plugins-wnck) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_NAME}.plugin DESTINATION ${PLUGINS_DIRECTORY} COMPONENT plugins-wnck) diff --git a/applets/wnck/wincmd/CMakeLists.txt b/applets/wnck/wincmd/CMakeLists.txt index 6e3a5bae..1c6cd0bc 100644 --- a/applets/wnck/wincmd/CMakeLists.txt +++ b/applets/wnck/wincmd/CMakeLists.txt @@ -32,5 +32,5 @@ target_link_libraries (${PLUGIN_NAME} ${LIBS} valapanel) target_include_directories (${PLUGIN_NAME} PRIVATE ${LIB_PATHS}) # Install plugin stuffs -install(TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGINS_DIRECTORY}) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_NAME}.plugin DESTINATION ${PLUGINS_DIRECTORY}) +install(TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGINS_DIRECTORY} COMPONENT plugins-wnck) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_NAME}.plugin DESTINATION ${PLUGINS_DIRECTORY} COMPONENT plugins-wnck) diff --git a/applets/wnck/xembed/CMakeLists.txt b/applets/wnck/xembed/CMakeLists.txt index 07c38b48..e67e0fae 100644 --- a/applets/wnck/xembed/CMakeLists.txt +++ b/applets/wnck/xembed/CMakeLists.txt @@ -35,5 +35,5 @@ target_link_libraries (${PLUGIN_NAME} ${LIBS} valapanel) target_include_directories (${PLUGIN_NAME} PRIVATE ${LIB_PATHS}) # Install plugin stuffs -install(TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGINS_DIRECTORY}) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_NAME}.plugin DESTINATION ${PLUGINS_DIRECTORY}) +install(TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGINS_DIRECTORY} COMPONENT plugins-wnck) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_NAME}.plugin DESTINATION ${PLUGINS_DIRECTORY} COMPONENT plugins-wnck) diff --git a/cmake b/cmake index 7a5daeac..e381b1ad 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 7a5daeac1a147b25618cc8d1963908c7661d59fb +Subproject commit e381b1addb08f70c72b665f2dfbc8469fb57495f diff --git a/data/gschemas/CMakeLists.txt b/data/gschemas/CMakeLists.txt index ae4add59..541d0534 100644 --- a/data/gschemas/CMakeLists.txt +++ b/data/gschemas/CMakeLists.txt @@ -1,7 +1,7 @@ include(GSettings) -add_schema("org.valapanel.gschema.xml") -add_schema("org.valapanel.toplevel.gschema.xml") -add_schema("org.valapanel.toplevel.plugin.gschema.xml") -add_schema("org.valapanel.builtin.gschema.xml") -add_schema("org.valapanel.plugins.gschema.xml") -add_schema("org.valapanel.X.gschema.xml") +add_schema("org.valapanel.gschema.xml" "bin") +add_schema("org.valapanel.toplevel.gschema.xml" "bin") +add_schema("org.valapanel.toplevel.plugin.gschema.xml" "bin") +add_schema("org.valapanel.builtin.gschema.xml" "bin") +add_schema("org.valapanel.plugins.gschema.xml" "bin") +add_schema("org.valapanel.X.gschema.xml" "bin") diff --git a/data/images/CMakeLists.txt b/data/images/CMakeLists.txt index 99ebc563..20b0f3de 100644 --- a/data/images/CMakeLists.txt +++ b/data/images/CMakeLists.txt @@ -1,2 +1,2 @@ -install(FILES panel.svg DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps RENAME vala-panel.svg) -install(FILES background.png DESTINATION ${DATADIR}/images) +install(FILES panel.svg DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps RENAME vala-panel.svg COMPONENT bin) +install(FILES background.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/vala-panel/images COMPONENT bin) diff --git a/data/profiles/appmenu/CMakeLists.txt b/data/profiles/appmenu/CMakeLists.txt index f0d99fc6..9a11ab23 100644 --- a/data/profiles/appmenu/CMakeLists.txt +++ b/data/profiles/appmenu/CMakeLists.txt @@ -1,3 +1,3 @@ get_filename_component(PROFILE_NAME ${CMAKE_CURRENT_SOURCE_DIR} NAME) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/config DESTINATION ${PROFILES_DIR}/${PROFILE_NAME}) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/panels/top DESTINATION ${PROFILES_DIR}/${PROFILE_NAME}/panels) +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/config DESTINATION ${PROFILES_DIR}/${PROFILE_NAME} COMPONENT bin) +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/panels/top DESTINATION ${PROFILES_DIR}/${PROFILE_NAME}/panels COMPONENT bin) diff --git a/data/profiles/default/CMakeLists.txt b/data/profiles/default/CMakeLists.txt index b09fe316..340669ad 100644 --- a/data/profiles/default/CMakeLists.txt +++ b/data/profiles/default/CMakeLists.txt @@ -1,4 +1,4 @@ get_filename_component(PROFILE_NAME ${CMAKE_CURRENT_SOURCE_DIR} NAME) configure_file (${CMAKE_CURRENT_SOURCE_DIR}/panels/panel.in ${CMAKE_CURRENT_BINARY_DIR}/panels/panel) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/config DESTINATION ${PROFILES_DIR}/${PROFILE_NAME}) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/panels/panel DESTINATION ${PROFILES_DIR}/${PROFILE_NAME}/panels) +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/config DESTINATION ${PROFILES_DIR}/${PROFILE_NAME} COMPONENT bin) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/panels/panel DESTINATION ${PROFILES_DIR}/${PROFILE_NAME}/panels COMPONENT bin) diff --git a/data/profiles/two_panels/CMakeLists.txt b/data/profiles/two_panels/CMakeLists.txt index 0fe95436..a4d65b92 100644 --- a/data/profiles/two_panels/CMakeLists.txt +++ b/data/profiles/two_panels/CMakeLists.txt @@ -1,4 +1,4 @@ get_filename_component(PROFILE_NAME ${CMAKE_CURRENT_SOURCE_DIR} NAME) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/config DESTINATION ${PROFILES_DIR}/${PROFILE_NAME}) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/panels/top DESTINATION ${PROFILES_DIR}/${PROFILE_NAME}/panels) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/panels/bottom DESTINATION ${PROFILES_DIR}/${PROFILE_NAME}/panels) +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/config DESTINATION ${PROFILES_DIR}/${PROFILE_NAME} COMPONENT bin) +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/panels/top DESTINATION ${PROFILES_DIR}/${PROFILE_NAME}/panels COMPONENT bin) +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/panels/bottom DESTINATION ${PROFILES_DIR}/${PROFILE_NAME}/panels COMPONENT bin) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index d41678bd..3739bb78 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -58,10 +58,10 @@ set_target_properties (${LIBNAME} PROPERTIES VERSION ${LIBVERSION}.0 SOVERSION ${SOVERSION}) -install (TARGETS ${LIBNAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}) +install (TARGETS ${LIBNAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT bin) # Install lib stuffs -install (FILES ${CMAKE_BINARY_DIR}/${APPNAME}.pc DESTINATION lib/pkgconfig/) -install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${APPNAME}.vapi DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/vala/vapi/) -install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/${APPNAME}.deps DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/vala/vapi/) -install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${APPNAME}.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/vala-panel/) +install (FILES ${CMAKE_BINARY_DIR}/${APPNAME}.pc DESTINATION lib/pkgconfig/ COMPONENT dev) +install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${APPNAME}.vapi DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/vala/vapi/ COMPONENT dev) +install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/${APPNAME}.deps DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/vala/vapi/ COMPONENT dev) +install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${APPNAME}.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/vala-panel/ COMPONENT dev) diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt index 6f4e2ac7..4c4ce765 100644 --- a/po/CMakeLists.txt +++ b/po/CMakeLists.txt @@ -1,5 +1,5 @@ include(Translations) -add_translations_directory("vala-panel") +add_translations_directory("vala-panel" "bin") add_translations_catalog("vala-panel" ../lib ../app