diff options
| author | dundargoc <33953936+dundargoc@users.noreply.github.com> | 2023-02-26 22:32:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-26 22:32:08 +0100 |
| commit | 1e37703a74eeebfa14c401db865157c39f1215bf (patch) | |
| tree | d5407e5aa49490b748f123c62182115045df15e7 /cmake.deps | |
| parent | 774e59f3f9bf50c8350857c6722bb58df2dd940a (diff) | |
| download | rneovim-1e37703a74eeebfa14c401db865157c39f1215bf.tar.gz rneovim-1e37703a74eeebfa14c401db865157c39f1215bf.tar.bz2 rneovim-1e37703a74eeebfa14c401db865157c39f1215bf.zip | |
build: remove pkgconfig-related code (#22422)
Cmake should already be able to find everything on its own.
Diffstat (limited to 'cmake.deps')
| -rw-r--r-- | cmake.deps/CMakeLists.txt | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/cmake.deps/CMakeLists.txt b/cmake.deps/CMakeLists.txt index 836d9e62c6..6c71173766 100644 --- a/cmake.deps/CMakeLists.txt +++ b/cmake.deps/CMakeLists.txt @@ -34,24 +34,14 @@ if(HAS_OG_FLAG) set(DEFAULT_MAKE_CFLAGS CFLAGS+=-Og ${DEFAULT_MAKE_CFLAGS}) endif() -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() - -list(APPEND DEPS_CMAKE_ARGS -D CMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR}) - +set(DEPS_INSTALL_DIR "${CMAKE_BINARY_DIR}/usr" CACHE PATH "Dependencies install directory.") 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.") set(DEPS_DOWNLOAD_DIR "${DEPS_BUILD_DIR}/downloads" CACHE PATH "Dependencies download directory.") +list(APPEND DEPS_CMAKE_ARGS -D CMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR}) + option(USE_BUNDLED "Use bundled dependencies." ON) option(USE_BUNDLED_UNIBILIUM "Use the bundled unibilium." ${USE_BUNDLED}) |