diff options
| author | Kai Pastor <dg0yt@darc.de> | 2021-05-25 01:22:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-24 16:22:40 -0700 |
| commit | 43ae0c9f9e69df0090d4f971807c493af00645ee (patch) | |
| tree | 82004dcd423d59a687c64fb7e430090f403107e3 /scripts | |
| parent | 43df697b6b8af6ea3d928c0d112ba1c428fb8faf (diff) | |
| download | vcpkg-43ae0c9f9e69df0090d4f971807c493af00645ee.tar.gz vcpkg-43ae0c9f9e69df0090d4f971807c493af00645ee.zip | |
[vcpkg_fixup_pkgconfig] Fix handling of empty fields (#17898)
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/cmake/vcpkg_fixup_pkgconfig.cmake | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/cmake/vcpkg_fixup_pkgconfig.cmake b/scripts/cmake/vcpkg_fixup_pkgconfig.cmake index a629ac8c9..c6384f33a 100644 --- a/scripts/cmake/vcpkg_fixup_pkgconfig.cmake +++ b/scripts/cmake/vcpkg_fixup_pkgconfig.cmake @@ -159,17 +159,17 @@ function(vcpkg_fixup_pkgconfig) # --static. if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") # Libs comes before Libs.private - string(REGEX REPLACE "(^|\n)(Libs: [^\n]*)(.*)\nLibs.private:( [^\n]*)" "\\1\\2\\4\\3" _contents "${_contents}") + string(REGEX REPLACE "(^|\n)(Libs: *[^\n]*)(.*)\nLibs.private:( *[^\n]*)" "\\1\\2\\4\\3" _contents "${_contents}") # Libs.private comes before Libs - string(REGEX REPLACE "(^|\n)Libs.private:( [^\n]*)(.*\nLibs: [^\n]*)" "\\3\\2" _contents "${_contents}") + string(REGEX REPLACE "(^|\n)Libs.private:( *[^\n]*)(.*\nLibs: *[^\n]*)" "\\3\\2" _contents "${_contents}") # Only Libs.private - string(REGEX REPLACE "(^|\n)Libs.private: " "\\1Libs: " _contents "${_contents}") + string(REGEX REPLACE "(^|\n)Libs.private: *" "\\1Libs: " _contents "${_contents}") # Requires comes before Requires.private - string(REGEX REPLACE "(^|\n)(Requires: [^\n]*)(.*)\nRequires.private:( [^\n]*)" "\\1\\2\\4\\3" _contents "${_contents}") + string(REGEX REPLACE "(^|\n)(Requires: *[^\n]*)(.*)\nRequires.private:( *[^\n]*)" "\\1\\2\\4\\3" _contents "${_contents}") # Requires.private comes before Requires - string(REGEX REPLACE "(^|\n)Requires.private:( [^\n]*)(.*\nRequires: [^\n]*)" "\\3\\2" _contents "${_contents}") + string(REGEX REPLACE "(^|\n)Requires.private:( *[^\n]*)(.*\nRequires: *[^\n]*)" "\\3\\2" _contents "${_contents}") # Only Requires.private - string(REGEX REPLACE "(^|\n)Requires.private: " "\\1Requires: " _contents "${_contents}") + string(REGEX REPLACE "(^|\n)Requires.private: *" "\\1Requires: " _contents "${_contents}") endif() file(WRITE "${_file}" "prefix=\${pcfiledir}/${RELATIVE_PC_PATH}\n${_contents}") unset(PKG_LIB_SEARCH_PATH) |