diff options
| author | Daniel Hahler <git@thequod.de> | 2019-06-25 17:34:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-25 17:34:28 +0200 |
| commit | 3e6f06f5d2bea05767c62420b4a73a0c266f7f5a (patch) | |
| tree | bebc208df4cade36dac41d6040787834d22f16ff | |
| parent | e13ae7cae641bde5cd744378051d0a7f8b892d33 (diff) | |
| download | rneovim-3e6f06f5d2bea05767c62420b4a73a0c266f7f5a.tar.gz rneovim-3e6f06f5d2bea05767c62420b4a73a0c266f7f5a.tar.bz2 rneovim-3e6f06f5d2bea05767c62420b4a73a0c266f7f5a.zip | |
build: use main cmake modules with third-party (#10330)
This is meant to make it possible to use `find_package(LuaJit)` etc with
the third-party CMake project in general.
Followup to https://github.com/neovim/neovim/pull/10297/files#r296439576.
| -rw-r--r-- | third-party/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | third-party/cmake/BuildLuarocks.cmake | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt index 90581462d7..d789e48299 100644 --- a/third-party/CMakeLists.txt +++ b/third-party/CMakeLists.txt @@ -6,7 +6,7 @@ project(NVIM_DEPS) include(CheckCCompilerFlag) # Point CMake at any custom modules we may ship -list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake") +list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" "${PROJECT_SOURCE_DIR}/../cmake") # In Windows/MSVC CMAKE_BUILD_TYPE changes the paths/linking of the build # recipes (libuv, msgpack), make sure it is set diff --git a/third-party/cmake/BuildLuarocks.cmake b/third-party/cmake/BuildLuarocks.cmake index 1f707ddd8a..2ae0e84ecd 100644 --- a/third-party/cmake/BuildLuarocks.cmake +++ b/third-party/cmake/BuildLuarocks.cmake @@ -59,7 +59,6 @@ if(UNIX OR (MINGW AND CMAKE_CROSSCOMPILING)) list(APPEND LUAROCKS_OPTS --with-lua=${HOSTDEPS_INSTALL_DIR}) else() - list(APPEND CMAKE_MODULE_PATH "../cmake") find_package(LuaJit) if(LUAJIT_FOUND) list(APPEND LUAROCKS_OPTS |