summaryrefslogtreecommitdiffstats
path: root/Tests
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-12-02 17:07:24 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2013-12-02 17:07:24 (GMT)
commited1de30da06a22bc6d9cfd147a99f7728f175802 (patch)
tree1b4c0899f270d04c7e099045e436688f46cf2e36 /Tests
parent55f2a3d62754001fe44209f513ed81f90dab9338 (diff)
parent7b390f75e82ad79f6759656c52825c89e5c92902 (diff)
downloadCMake-ed1de30da06a22bc6d9cfd147a99f7728f175802.zip
CMake-ed1de30da06a22bc6d9cfd147a99f7728f175802.tar.gz
CMake-ed1de30da06a22bc6d9cfd147a99f7728f175802.tar.bz2
Merge topic 'wix-components'
7b390f7 CPackWiX: add CPack component support
Diffstat (limited to 'Tests')
-rw-r--r--Tests/CPackWiXGenerator/CMakeLists.txt14
1 files changed, 13 insertions, 1 deletions
diff --git a/Tests/CPackWiXGenerator/CMakeLists.txt b/Tests/CPackWiXGenerator/CMakeLists.txt
index b54925a..ecfecdb 100644
--- a/Tests/CPackWiXGenerator/CMakeLists.txt
+++ b/Tests/CPackWiXGenerator/CMakeLists.txt
@@ -14,11 +14,16 @@ install(TARGETS mylib
DESTINATION lib
COMPONENT libraries)
-install(TARGETS my-libapp my-other-app
+install(TARGETS my-libapp
RUNTIME
DESTINATION bin
COMPONENT applications)
+install(TARGETS my-other-app
+ RUNTIME
+ DESTINATION bin
+ COMPONENT applications2)
+
install(FILES mylib.h "file with spaces.h"
DESTINATION include
COMPONENT headers)
@@ -56,11 +61,18 @@ cpack_add_component_group(Development
DESCRIPTION "All of the tools you'll ever need to develop software")
cpack_add_component(applications
+ REQUIRED
DISPLAY_NAME "MyLib Application"
DESCRIPTION "An extremely useful application that makes use of MyLib"
GROUP Runtime
INSTALL_TYPES Full)
+cpack_add_component(applications2
+ DISPLAY_NAME "MyLib Extra Application"
+ DESCRIPTION "Another extremely useful application that makes use of MyLib"
+ GROUP Runtime
+ INSTALL_TYPES Full)
+
cpack_add_component(documentation
DISPLAY_NAME "MyLib Documentation"
DESCRIPTION "The extensive suite of MyLib Application documentation files"