summaryrefslogtreecommitdiffstats
path: root/Tests
diff options
context:
space:
mode:
authorDavid Cole <david.cole@kitware.com>2009-01-20 19:29:41 (GMT)
committerDavid Cole <david.cole@kitware.com>2009-01-20 19:29:41 (GMT)
commit03c940aeb38c1456df336262d667b69304de0504 (patch)
treee9c6ef42249e65c10673071154f18b9498779219 /Tests
parent7f92b77997dcc5fa2d1e9455ad2d494fceea9786 (diff)
downloadCMake-03c940aeb38c1456df336262d667b69304de0504.zip
CMake-03c940aeb38c1456df336262d667b69304de0504.tar.gz
CMake-03c940aeb38c1456df336262d667b69304de0504.tar.bz2
BUG: Fix for issue #7470. Allow spaces in the path names of installed files with the NSIS CPack generator and component-based installs. Add an installed file to the CPackComponents test: it failed before the fix; now it passes.
Diffstat (limited to 'Tests')
-rw-r--r--Tests/CPackComponents/CMakeLists.txt8
-rw-r--r--Tests/CPackComponents/Issue 7470.html9
2 files changed, 17 insertions, 0 deletions
diff --git a/Tests/CPackComponents/CMakeLists.txt b/Tests/CPackComponents/CMakeLists.txt
index d41faa0..862d139 100644
--- a/Tests/CPackComponents/CMakeLists.txt
+++ b/Tests/CPackComponents/CMakeLists.txt
@@ -39,6 +39,9 @@ install(TARGETS mylibapp
install(FILES mylib.h
DESTINATION include
COMPONENT headers)
+install(FILES "Issue 7470.html"
+ DESTINATION docs
+ COMPONENT documentation)
if(mylib_install_to_absolute_path)
install(FILES mylib.cpp
@@ -77,6 +80,11 @@ cpack_add_component(applications
DESCRIPTION "An 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"
+ GROUP Runtime
+ INSTALL_TYPES Full)
cpack_add_component(libraries
DISPLAY_NAME "Libraries"
DESCRIPTION "Static libraries used to build programs with MyLib"
diff --git a/Tests/CPackComponents/Issue 7470.html b/Tests/CPackComponents/Issue 7470.html
new file mode 100644
index 0000000..12df2c8
--- /dev/null
+++ b/Tests/CPackComponents/Issue 7470.html
@@ -0,0 +1,9 @@
+<html>
+<body>
+The install rule for this file demonstrates the problem described in<br/>
+CMake issue #7470:<br/>
+<br/>
+<a href="http://public.kitware.com/Bug/view.php?id=7470">
+http://public.kitware.com/Bug/view.php?id=7470</a><br/>
+</body>
+</html>