diff options
| author | Oliver Marriott <rktjmp@users.noreply.github.com> | 2021-06-14 04:03:47 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-13 14:03:47 -0400 |
| commit | e2bc0bf6656124afc47980210e96c31bd3357bea (patch) | |
| tree | 22d5bfd094cb8b53deb18af55223e64185d25fa0 /third-party | |
| parent | 141647cfbb1f137e3eefe6ba8e658b475e902cac (diff) | |
| download | rneovim-e2bc0bf6656124afc47980210e96c31bd3357bea.tar.gz rneovim-e2bc0bf6656124afc47980210e96c31bd3357bea.tar.bz2 rneovim-e2bc0bf6656124afc47980210e96c31bd3357bea.zip | |
fix(ci): adjust DEPS_INSTALL_DIR on OpenBSD to avoid pkg-config bug (#14803)
Also bumps to OpenBSD 6.9 and updates packages.
Co-authored-by: glacambre <code@lacamb.re>
Diffstat (limited to 'third-party')
| -rw-r--r-- | third-party/CMakeLists.txt | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt index df7f1a0ac2..f9da7c497a 100644 --- a/third-party/CMakeLists.txt +++ b/third-party/CMakeLists.txt @@ -21,7 +21,17 @@ if(HAS_OG_FLAG) set(DEFAULT_MAKE_CFLAGS CFLAGS+=-Og ${DEFAULT_MAKE_CFLAGS}) endif() -set(DEPS_INSTALL_DIR "${CMAKE_BINARY_DIR}/usr" CACHE PATH "Dependencies install directory.") +if(CMAKE_SYSTEM_NAME MATCHES "OpenBSD") + # pkg-config 29.2 has a bug on OpenBSD which causes it to drop any paths that + # *contain* system include paths. To avoid this, we prefix what would be + # "/usr/include" as "/_usr/include". + # This check is also performed in the root CMakeLists.txt + # https://github.com/neovim/neovim/pull/14745#issuecomment-860201794 + set(DEPS_INSTALL_DIR "${CMAKE_BINARY_DIR}/_usr" CACHE PATH "Dependencies install directory.") +else() + set(DEPS_INSTALL_DIR "${CMAKE_BINARY_DIR}/usr" CACHE PATH "Dependencies install directory.") +endif() + set(DEPS_BIN_DIR "${DEPS_INSTALL_DIR}/bin" CACHE PATH "Dependencies binary install directory.") set(DEPS_LIB_DIR "${DEPS_INSTALL_DIR}/lib" CACHE PATH "Dependencies library install directory.") set(DEPS_BUILD_DIR "${CMAKE_BINARY_DIR}/build" CACHE PATH "Dependencies build directory.") |