From 3e6f06f5d2bea05767c62420b4a73a0c266f7f5a Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Tue, 25 Jun 2019 17:34:28 +0200 Subject: [PATCH] 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. --- third-party/CMakeLists.txt | 2 +- third-party/cmake/BuildLuarocks.cmake | 1 - 2 files changed, 1 insertion(+), 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