diff options
author | Brad King <brad.king@kitware.com> | 2014-06-10 13:17:35 (GMT) |
---|---|---|
committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-06-10 13:17:35 (GMT) |
commit | 0c73273b1a47f54f3c299f20b8729ab6492871d8 (patch) | |
tree | 836d590f6d85ec41d1088c6ab74a65818fa6ab02 /Source/CPack | |
parent | 58f8e6bc5ca5b1a2bd6e3a85df05c15d9e4f4a58 (diff) | |
parent | 1b003c1f9542ec3bb638b1b16de6d85a424f1c53 (diff) | |
download | CMake-0c73273b1a47f54f3c299f20b8729ab6492871d8.zip CMake-0c73273b1a47f54f3c299f20b8729ab6492871d8.tar.gz CMake-0c73273b1a47f54f3c299f20b8729ab6492871d8.tar.bz2 |
Merge topic 'dev/static-regex'
1b003c1f cmTarget: Remove an unused variable
7492a7b8 regex: Search on strings where possible
3e7194a2 regex: Use static regexs where possible
Diffstat (limited to 'Source/CPack')
-rw-r--r-- | Source/CPack/cmCPackNSISGenerator.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/CPack/cmCPackNSISGenerator.cxx b/Source/CPack/cmCPackNSISGenerator.cxx index 0113698..a5eee6b 100644 --- a/Source/CPack/cmCPackNSISGenerator.cxx +++ b/Source/CPack/cmCPackNSISGenerator.cxx @@ -588,8 +588,8 @@ void cmCPackNSISGenerator::CreateMenuLinks( cmOStringStream& str, return; } - cmsys::RegularExpression urlRegex; - urlRegex.compile("^(mailto:|(ftps?|https?|news)://).*$"); + static cmsys::RegularExpression + urlRegex("^(mailto:|(ftps?|https?|news)://).*$"); std::vector<std::string>::iterator it; for ( it = cpackMenuLinksVector.begin(); |