From 21b23eefedd113cadb47cd4bf6365854353338ea Mon Sep 17 00:00:00 2001
From: Mihael Koep <koep@schneide.com>
Date: Tue, 15 Oct 2013 15:21:26 +0200
Subject: Package binary programs in a 'tools' package.

Conflicts:
	bin/gui/CMakeLists.txt
	bin/tools/CMakeLists.txt
---
 bin/gui/CMakeLists.txt   | 6 ++++--
 bin/tools/CMakeLists.txt | 3 ++-
 package.sh.in            | 6 +++++-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/bin/gui/CMakeLists.txt b/bin/gui/CMakeLists.txt
index a75b5b1..8ee80ed 100644
--- a/bin/gui/CMakeLists.txt
+++ b/bin/gui/CMakeLists.txt
@@ -35,9 +35,11 @@ if (GTK2_FOUND)
         ${GTHREAD2_LIBRARIES})
 
     install(TARGETS ${BINARY}
-            RUNTIME DESTINATION ${UCA_BINDIR})
+            RUNTIME DESTINATION ${UCA_BINDIR}
+            COMPONENT executables)
 
     install(FILES control.glade
-            DESTINATION ${UCA_GLADEDIR})
+            DESTINATION ${UCA_GLADEDIR}
+            COMPONENT executables)
 endif()
 #}}}
diff --git a/bin/tools/CMakeLists.txt b/bin/tools/CMakeLists.txt
index 964b1f9..4070523 100644
--- a/bin/tools/CMakeLists.txt
+++ b/bin/tools/CMakeLists.txt
@@ -35,5 +35,6 @@ target_link_libraries(uca-benchmark ${libs})
 #}}}
 
 install(TARGETS uca-benchmark uca-grab uca-gen-doc
-        RUNTIME DESTINATION ${UCA_BINDIR})
+        RUNTIME DESTINATION ${UCA_BINDIR}
+        COMPONENT executables)
 #}}}
diff --git a/package.sh.in b/package.sh.in
index b9ac673..f20e7c1 100644
--- a/package.sh.in
+++ b/package.sh.in
@@ -1,7 +1,11 @@
 HEADERS_POSTFIX="devel"
+PROGRAMS_POSTFIX="tools"
+PACKAGE_VERSION="${UCA_VERSION_MAJOR}.${UCA_VERSION_MINOR}.${UCA_VERSION_PATCH}"
+
+cpack -D CPACK_INSTALL_CMAKE_PROJECTS="${CMAKE_CURRENT_BINARY_DIR}/;Project;executables;/" -D CPACK_PACKAGE_NAME="${CPACK_PACKAGE_NAME}-$PROGRAMS_POSTFIX" -D CPACK_PACKAGE_FILE_NAME="${CPACK_PACKAGE_NAME}-$PACKAGE_VERSION-$PROGRAMS_POSTFIX"
 
 cpack -D CPACK_INSTALL_CMAKE_PROJECTS="${CMAKE_CURRENT_BINARY_DIR}/;Project;libraries;/" -D CPACK_PACKAGE_VERSION=${UCA_VERSION_STRING}
-cpack -D CPACK_INSTALL_CMAKE_PROJECTS="${CMAKE_CURRENT_BINARY_DIR}/;Project;headers;/" -D CPACK_PACKAGE_NAME="${CPACK_PACKAGE_NAME}-$HEADERS_POSTFIX" -D CPACK_PACKAGE_FILE_NAME="${CPACK_PACKAGE_NAME}-${UCA_VERSION_MAJOR}.${UCA_VERSION_MINOR}.${UCA_VERSION_PATCH}-$HEADERS_POSTFIX"
+cpack -D CPACK_INSTALL_CMAKE_PROJECTS="${CMAKE_CURRENT_BINARY_DIR}/;Project;headers;/" -D CPACK_PACKAGE_NAME="${CPACK_PACKAGE_NAME}-$HEADERS_POSTFIX" -D CPACK_PACKAGE_FILE_NAME="${CPACK_PACKAGE_NAME}-$PACKAGE_VERSION-$HEADERS_POSTFIX"
 
 # Build packages for all available cameras
 for shell_script in `find -name 'package-plugin-*.sh'`; do
-- 
cgit v1.2.3