diff options
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/FindLibIntl.cmake | 2 | ||||
| -rw-r--r-- | cmake/FindMsgpack.cmake | 2 | ||||
| -rw-r--r-- | cmake/GetCompileFlags.cmake | 1 | ||||
| -rw-r--r-- | cmake/LuaHelpers.cmake | 5 | ||||
| -rw-r--r-- | cmake/RunTests.cmake | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/cmake/FindLibIntl.cmake b/cmake/FindLibIntl.cmake index ab4632cf45..f8442566a9 100644 --- a/cmake/FindLibIntl.cmake +++ b/cmake/FindLibIntl.cmake @@ -27,7 +27,7 @@ find_path(LibIntl_INCLUDE_DIR ) find_library(LibIntl_LIBRARY - NAMES intl libintl.a + NAMES intl libintl ) if (LibIntl_INCLUDE_DIR) diff --git a/cmake/FindMsgpack.cmake b/cmake/FindMsgpack.cmake index 6716289a98..cca0a00c20 100644 --- a/cmake/FindMsgpack.cmake +++ b/cmake/FindMsgpack.cmake @@ -44,7 +44,7 @@ endif() if(MSVC) # The import library for the msgpack DLL has a different name - list(APPEND MSGPACK_NAMES msgpack_import) + list(APPEND MSGPACK_NAMES msgpackc_import) else() list(APPEND MSGPACK_NAMES msgpackc msgpack) endif() diff --git a/cmake/GetCompileFlags.cmake b/cmake/GetCompileFlags.cmake index e0994b67bc..527bc88cdd 100644 --- a/cmake/GetCompileFlags.cmake +++ b/cmake/GetCompileFlags.cmake @@ -38,6 +38,7 @@ function(get_compile_flags _compile_flags) get_directory_property(include_directories_list DIRECTORY "src/nvim" INCLUDE_DIRECTORIES) + list(REMOVE_DUPLICATES include_directories_list) foreach(include_directory ${include_directories_list}) set(include_directories "${include_directories} -I${include_directory}") endforeach() diff --git a/cmake/LuaHelpers.cmake b/cmake/LuaHelpers.cmake index 32f7e46a57..3cba47412b 100644 --- a/cmake/LuaHelpers.cmake +++ b/cmake/LuaHelpers.cmake @@ -4,9 +4,8 @@ # Check if a module is available in Lua function(check_lua_module LUA_PRG_PATH MODULE RESULT_VAR) - execute_process(COMMAND ${LUA_PRG_PATH} -e "require('${MODULE}')" - RESULT_VARIABLE module_missing - ERROR_QUIET) + execute_process(COMMAND ${LUA_PRG_PATH} -l "${MODULE}" -e "" + RESULT_VARIABLE module_missing) if(module_missing) set(${RESULT_VAR} False PARENT_SCOPE) else() diff --git a/cmake/RunTests.cmake b/cmake/RunTests.cmake index 95c06aeb94..5b62fd72c9 100644 --- a/cmake/RunTests.cmake +++ b/cmake/RunTests.cmake @@ -38,7 +38,7 @@ set(ENV{SYSTEM_NAME} ${SYSTEM_NAME}) execute_process( COMMAND ${BUSTED_PRG} ${TEST_TAG} ${TEST_FILTER} -v -o ${BUSTED_OUTPUT_TYPE} --lua=${LUA_PRG} --lazy --helper=${TEST_DIR}/${TEST_TYPE}/preload.lua - --lpath=${BUILD_DIR}/?.lua ${TEST_PATH} + --lpath=${BUILD_DIR}/?.lua --lpath=?.lua ${TEST_PATH} WORKING_DIRECTORY ${WORKING_DIR} ERROR_VARIABLE err RESULT_VARIABLE res |