diff options
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/FindLpeg.cmake | 9 | ||||
| -rw-r--r-- | cmake/FindLuajit.cmake | 2 | ||||
| -rw-r--r-- | cmake/FindLuv.cmake | 12 | ||||
| -rw-r--r-- | cmake/GenerateVersion.cmake | 1 | ||||
| -rw-r--r-- | cmake/WindowsDllCopy.cmake | 2 |
5 files changed, 5 insertions, 21 deletions
diff --git a/cmake/FindLpeg.cmake b/cmake/FindLpeg.cmake index 4354f815b5..43c839da9a 100644 --- a/cmake/FindLpeg.cmake +++ b/cmake/FindLpeg.cmake @@ -1,11 +1,4 @@ -find_library(LPEG_LIBRARY NAMES lpeg_a lpeg liblpeg_a) - -# Ubuntu-specific workaround to find system paths -function(ubuntu) - set(CMAKE_FIND_LIBRARY_PREFIXES "") - find_library(LPEG_LIBRARY NAMES lpeg PATH_SUFFIXES lua/5.1) -endfunction() -ubuntu() +find_library(LPEG_LIBRARY NAMES lpeg_a lpeg liblpeg_a lpeg${CMAKE_SHARED_LIBRARY_SUFFIX} PATH_SUFFIXES lua/5.1) find_package_handle_standard_args(Lpeg DEFAULT_MSG LPEG_LIBRARY) mark_as_advanced(LPEG_LIBRARY) diff --git a/cmake/FindLuajit.cmake b/cmake/FindLuajit.cmake index 711c2c0c09..f06b7ca6ad 100644 --- a/cmake/FindLuajit.cmake +++ b/cmake/FindLuajit.cmake @@ -1,5 +1,5 @@ find_path(LUAJIT_INCLUDE_DIR luajit.h - PATH_SUFFIXES luajit-2.0 luajit-2.1) + PATH_SUFFIXES luajit-2.1) if(MSVC) list(APPEND LUAJIT_NAMES lua51) diff --git a/cmake/FindLuv.cmake b/cmake/FindLuv.cmake index ebd74887ed..7544859ceb 100644 --- a/cmake/FindLuv.cmake +++ b/cmake/FindLuv.cmake @@ -1,13 +1,5 @@ -find_path(LUV_INCLUDE_DIR luv/luv.h) -find_library(LUV_LIBRARY NAMES luv_a luv libluv_a) - -# Ubuntu-specific workaround to find system paths -function(ubuntu) - set(CMAKE_FIND_LIBRARY_PREFIXES "") - find_path(LUV_INCLUDE_DIR luv/luv.h PATH_SUFFIXES lua5.1) - find_library(LUV_LIBRARY NAMES luv PATH_SUFFIXES lua/5.1) -endfunction() -ubuntu() +find_path(LUV_INCLUDE_DIR luv/luv.h PATH_SUFFIXES lua5.1) +find_library(LUV_LIBRARY NAMES luv_a luv libluv_a luv${CMAKE_SHARED_LIBRARY_SUFFIX} PATH_SUFFIXES lua/5.1) find_package_handle_standard_args(Luv DEFAULT_MSG LUV_LIBRARY LUV_INCLUDE_DIR) diff --git a/cmake/GenerateVersion.cmake b/cmake/GenerateVersion.cmake index 0758dad8ad..a52dca970f 100644 --- a/cmake/GenerateVersion.cmake +++ b/cmake/GenerateVersion.cmake @@ -7,7 +7,6 @@ execute_process( OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET RESULT_VARIABLE RES) - if(RES) message(STATUS "Using NVIM_VERSION: ${NVIM_VERSION}") file(WRITE "${OUTPUT}" "") diff --git a/cmake/WindowsDllCopy.cmake b/cmake/WindowsDllCopy.cmake index b51e66e5cc..c972d88f57 100644 --- a/cmake/WindowsDllCopy.cmake +++ b/cmake/WindowsDllCopy.cmake @@ -23,7 +23,7 @@ foreach(DLL_NAME ${DLLS}) message(FATAL_ERROR "Unable to find dependency ${DLL_NAME}") endif() - if($ENV{CI} MATCHES "true") + if(CI_BUILD) message("Copying ${DLL_NAME} to ${DST}") endif() execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${DLL_PATH} ${DST}) |