diff options
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/FindLibUV.cmake | 8 | ||||
| -rw-r--r-- | cmake/RunTests.cmake | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/cmake/FindLibUV.cmake b/cmake/FindLibUV.cmake index 951fb0435e..63babfea67 100644 --- a/cmake/FindLibUV.cmake +++ b/cmake/FindLibUV.cmake @@ -75,6 +75,14 @@ if(WIN32) list(APPEND LIBUV_LIBRARIES ws2_32) endif() +find_package(Threads) +if(Threads_FOUND) + # TODO: Fix the cmake file to properly handle static deps for bundled builds. + # Meanwhile just include the threads library if CMake tells us there's one to + # use. + list(APPEND LIBUV_LIBRARIES ${CMAKE_THREAD_LIBS_INIT}) +endif() + include(FindPackageHandleStandardArgs) # handle the QUIETLY and REQUIRED arguments and set LIBUV_FOUND to TRUE diff --git a/cmake/RunTests.cmake b/cmake/RunTests.cmake index 0c48a77b9a..e78392562f 100644 --- a/cmake/RunTests.cmake +++ b/cmake/RunTests.cmake @@ -10,6 +10,7 @@ set(ENV{VIMRUNTIME} ${WORKING_DIR}/runtime) set(ENV{NVIM_RPLUGIN_MANIFEST} ${BUILD_DIR}/Xtest_rplugin_manifest) set(ENV{XDG_CONFIG_HOME} ${BUILD_DIR}/Xtest_xdg/config) set(ENV{XDG_DATA_HOME} ${BUILD_DIR}/Xtest_xdg/share) +unset(ENV{XDG_DATA_DIRS}) if(NOT DEFINED ENV{NVIM_LOG_FILE}) set(ENV{NVIM_LOG_FILE} ${BUILD_DIR}/.nvimlog) |