cmake: fix fish install directory detection via pkg-config
#17147
Conversation
vszakats
changed the title
pkg-configfish install directory detection via pkg-config
|
Analysis of PR #17147 at b05fe9ae: Test 1452 failed, which has NOT been flaky recently, so there could be a real issue in this PR. Test 504 failed, which has NOT been flaky recently, so there could be a real issue in this PR. Generated by Testclutch |
@dfandrich Dan, here's the first live example (I've seen) for a failed test going green after a retry: https://github.com/curl/curl/actions/runs/14614053753/job/40998187449#check-step-16 |
|
Merged this, but realized that installing directly in a system directory may be unexpected. Ref: https://github.com/curl/curl/actions/runs/14614053753/job/40998191292?pr=17147#step:13:521 Instead of It means completions are lost after each (This replicates the logic found in autotools.) |
Also: - omit auto-detecting `CURL_COMPLETION_FISH_DIR` via `pkg-config` for cross-builds and when `CMAKE_INSTALL_PREFIX` is set. - flatten nested `if`s. Note: On macOS with Homebrew, `pkg-config --variable completionsdir fish` returns the version-specific Cellar path instead of the permanent path `/opt/homebrew/share/fish/vendor_completions.d/`. This mimics what autotools does, but may need further fixing, possibly upstream. https://github.com/Homebrew/homebrew-core/blob/9c13e62b009b8e814fda180e0fcc5096318daf31/Formula/f/fish.rb https://github.com/fish-shell/fish-shell/blob/ce631fd2fb1f5b63f5f0f1b4041a30dfad823d22/cmake/Install.cmake#L15-L21 Ref: #17147 Ref: 51170b5 #17159 Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1103938 Closes #17145
Follow-up to c8b0f0c curl#16833 Closes curl#17147
Also: - omit auto-detecting `CURL_COMPLETION_FISH_DIR` via `pkg-config` for cross-builds and when `CMAKE_INSTALL_PREFIX` is set. - flatten nested `if`s. Note: On macOS with Homebrew, `pkg-config --variable completionsdir fish` returns the version-specific Cellar path instead of the permanent path `/opt/homebrew/share/fish/vendor_completions.d/`. This mimics what autotools does, but may need further fixing, possibly upstream. https://github.com/Homebrew/homebrew-core/blob/9c13e62b009b8e814fda180e0fcc5096318daf31/Formula/f/fish.rb https://github.com/fish-shell/fish-shell/blob/ce631fd2fb1f5b63f5f0f1b4041a30dfad823d22/cmake/Install.cmake#L15-L21 Ref: curl#17147 Ref: 51170b5 curl#17159 Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1103938 Closes curl#17145
Follow-up to c8b0f0c #16833