diff options
| author | Mike Kruskal <mkruskal@google.com> | 2023-11-29 15:58:51 -0800 |
|---|---|---|
| committer | Mike Kruskal <mkruskal@google.com> | 2023-11-29 20:26:22 -0800 |
| commit | 05ad6525c3aae2ae5b6e1987227445a420caada7 (patch) | |
| tree | 0f8a700a006c9cbb46586ff64524ce82235f366f | |
| parent | c709a34fbdf90f3fca092967dc90bdf7c6597ba4 (diff) | |
| download | protobuf-05ad6525c3aae2ae5b6e1987227445a420caada7.tar.gz | |
Only substitute prefixes during installation setup.
This caused an issue on some platforms where `protobuf/java/core/src/main/java/com/google/protobuf/java_features.proto` was getting turned into the invalid path `java/core/src/main/java/com/google/java_features.proto`.
Fixes #14862
PiperOrigin-RevId: 586478133
| -rw-r--r-- | cmake/install.cmake | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cmake/install.cmake b/cmake/install.cmake index 998c2e31a..9679d5b26 100644 --- a/cmake/install.cmake +++ b/cmake/install.cmake @@ -78,7 +78,10 @@ foreach(_header ${protobuf_HEADERS}) elseif (_find_nosrc GREATER -1) set(_from_dir "${protobuf_SOURCE_DIR}") endif() - string(REPLACE "${_from_dir}" "" _header ${_header}) + # On some platforms `_form_dir` ends up being just "protobuf", which can + # easily match multiple times in our paths. We force it to only replace + # prefixes to avoid this case. + string(REGEX REPLACE "^${_from_dir}" "" _header ${_header}) get_filename_component(_extract_from "${_from_dir}/${_header}" ABSOLUTE) get_filename_component(_extract_name ${_header} NAME) get_filename_component(_extract_to "${CMAKE_INSTALL_INCLUDEDIR}/${_header}" DIRECTORY) |