summaryrefslogtreecommitdiffstats
path: root/Tests/CPackComponents
diff options
context:
space:
mode:
authorDavid Cole <david.cole@kitware.com>2011-01-07 19:24:04 (GMT)
committerDavid Cole <david.cole@kitware.com>2011-01-07 19:24:04 (GMT)
commit1bbe4e69171f3155f262bb12f15437db4b71c207 (patch)
treedd3ea1ec19e1912dbdaf3bdd71dbcc7abef33ebf /Tests/CPackComponents
parent4b05a213028b09660d4651b46a1cc3f102c8ad97 (diff)
downloadCMake-1bbe4e69171f3155f262bb12f15437db4b71c207.zip
CMake-1bbe4e69171f3155f262bb12f15437db4b71c207.tar.gz
CMake-1bbe4e69171f3155f262bb12f15437db4b71c207.tar.bz2
CPack: Detect more URLs in CPACK_NSIS_MENU_LINKS (#10644)
Previously, only strings containing "http:" qualified as URLs when found in CPACK_NSIS_MENU_LINKS. Now, we use a regex to detect strings beginning with any of the following: ftp:// ftps:// http:// https:// news:// mailto: This commit also moves the caller of CreateMenuLinks outside the "if (cpackPackageExecutables)" block, allowing clients to use CPACK_NSIS_MENU_LINKS without also having CPACK_PACKAGE_EXECUTABLES defined. That bit of this commit fixes the remainder of the issue described in http://public.kitware.com/Bug/view.php?id=7828 Also, added a set(CPACK_NSIS_MENU_LINKS ...) to the CPackComponents test to enable verifying that all of this actually works.
Diffstat (limited to 'Tests/CPackComponents')
-rw-r--r--Tests/CPackComponents/CMakeLists.txt10
1 files changed, 10 insertions, 0 deletions
diff --git a/Tests/CPackComponents/CMakeLists.txt b/Tests/CPackComponents/CMakeLists.txt
index 3ef8083..bbe834d 100644
--- a/Tests/CPackComponents/CMakeLists.txt
+++ b/Tests/CPackComponents/CMakeLists.txt
@@ -68,6 +68,16 @@ set(CPACK_PACKAGE_VERSION_MINOR "0")
set(CPACK_PACKAGE_VERSION_PATCH "0")
set(CPACK_PACKAGE_INSTALL_DIRECTORY "CPack Component Example")
+# Settings used when building NSIS installers
+set(CPACK_NSIS_MENU_LINKS
+ "ftp://ftpserver" "Test Ftp Link"
+ "ftps://ftpsserver" "Test Ftps Link"
+ "http://www.cmake.org" "CMake Web Site"
+ "https://github.com/" "Test Https Link"
+ "mailto:kitware@kitware.com" "Test MailTo Link"
+ "news://newsserver" "Test News Link"
+ )
+
# Include CPack to introduce the appropriate targets
include(CPack)