diff options
| author | Brad King <brad.king@kitware.com> | 2018-12-06 14:06:08 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-12-06 14:06:13 (GMT) |
| commit | 81bea69bd1d52977c3782d26560f34563394f487 (patch) | |
| tree | 119ff003d2fe9fe9e34b181c7af24c09f7625d6d /Source/CPack/cmCPackPKGGenerator.cxx | |
| parent | d69877fe8617031a4077bb2b97d76af6b2e7b088 (diff) | |
| parent | 7954ba9bc196b34ced6c3359c464afbd0678c2e0 (diff) | |
| download | CMake-81bea69bd1d52977c3782d26560f34563394f487.zip CMake-81bea69bd1d52977c3782d26560f34563394f487.tar.gz CMake-81bea69bd1d52977c3782d26560f34563394f487.tar.bz2 | |
Merge topic 'productbuild-encode-pkg-url-ref'
7954ba9bc1 productbuild: escape pkg-ref urls
652210e901 cmSystemTools: Add EncodeURL helper
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2681
Diffstat (limited to 'Source/CPack/cmCPackPKGGenerator.cxx')
| -rw-r--r-- | Source/CPack/cmCPackPKGGenerator.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/CPack/cmCPackPKGGenerator.cxx b/Source/CPack/cmCPackPKGGenerator.cxx index bdda386..9401bca 100644 --- a/Source/CPack/cmCPackPKGGenerator.cxx +++ b/Source/CPack/cmCPackPKGGenerator.cxx @@ -225,7 +225,8 @@ void cmCPackPKGGenerator::CreateChoice(const cmCPackComponent& component, xout.Content(this->GetPackageName(component)); } else { xout.Content("file:./"); - xout.Content(relativePackageLocation); + xout.Content(cmSystemTools::EncodeURL(relativePackageLocation, + /*escapeSlashes=*/false)); } xout.EndElement(); // pkg-ref } |