diff options
| author | dundargoc <33953936+dundargoc@users.noreply.github.com> | 2023-05-13 12:12:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-13 12:12:29 +0200 |
| commit | 10860164778327c0009f6efc8e020308cadb13a2 (patch) | |
| tree | 735513c4c2943080f5e554e8699f623fe6ecea06 /src/nvim | |
| parent | ed8c44f76762061e30cb8056483f55d38802eaef (diff) | |
| download | rneovim-10860164778327c0009f6efc8e020308cadb13a2.tar.gz rneovim-10860164778327c0009f6efc8e020308cadb13a2.tar.bz2 rneovim-10860164778327c0009f6efc8e020308cadb13a2.zip | |
build: cmake cleanup
- Simplify error checking when using execute_process.
- Set BUILD_SHARED_LIBS to OFF when building dependencies.
This is normally not needed, but msgpack interprets an unset
BUILD_SHARED_LIBS to build a shared library, which is the opposite of
the cmake behavior.
- Move function check_lua_module to Util.cmake.
- Remove unnecessary code.
- Make variable naming more consistent
Diffstat (limited to 'src/nvim')
| -rw-r--r-- | src/nvim/CMakeLists.txt | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt index 3bb054946f..325b376b30 100644 --- a/src/nvim/CMakeLists.txt +++ b/src/nvim/CMakeLists.txt @@ -9,7 +9,7 @@ if(TARGET libuv::uv_a) else() # Fall back to find module for older libuv versions that don't provide config file find_package(Libuv 1.28.0 REQUIRED MODULE) - target_include_directories(libuv SYSTEM BEFORE INTERFACE ${LIBUV_INCLUDE_DIRS}) + target_include_directories(libuv SYSTEM BEFORE INTERFACE ${LIBUV_INCLUDE_DIR}) target_link_libraries(libuv INTERFACE ${LIBUV_LIBRARIES}) endif() @@ -21,9 +21,9 @@ elseif(APPLE) set_target_properties(nlua0 PROPERTIES LINK_FLAGS "-undefined dynamic_lookup") endif() -find_package(Libluv 1.43.0 REQUIRED) -target_include_directories(main_lib SYSTEM BEFORE INTERFACE ${LIBLUV_INCLUDE_DIR}) -target_link_libraries(main_lib INTERFACE ${LIBLUV_LIBRARY}) +find_package(Luv 1.43.0 REQUIRED) +target_include_directories(main_lib SYSTEM BEFORE INTERFACE ${LUV_INCLUDE_DIR}) +target_link_libraries(main_lib INTERFACE ${LUV_LIBRARY}) find_package(Iconv REQUIRED) find_package(Lpeg REQUIRED) @@ -61,11 +61,11 @@ if(PREFER_LUA) find_package(Luajit) else() find_package(Luajit REQUIRED) - target_include_directories(main_lib SYSTEM BEFORE INTERFACE ${LUAJIT_INCLUDE_DIRS}) - target_link_libraries(main_lib INTERFACE ${LUAJIT_LIBRARIES}) - target_include_directories(nlua0 SYSTEM BEFORE PUBLIC ${LUAJIT_INCLUDE_DIRS}) + target_include_directories(main_lib SYSTEM BEFORE INTERFACE ${LUAJIT_INCLUDE_DIR}) + target_link_libraries(main_lib INTERFACE ${LUAJIT_LIBRARY}) + target_include_directories(nlua0 SYSTEM BEFORE PUBLIC ${LUAJIT_INCLUDE_DIR}) if(WIN32) - target_link_libraries(nlua0 PUBLIC ${LUAJIT_LIBRARIES}) + target_link_libraries(nlua0 PUBLIC ${LUAJIT_LIBRARY}) endif() endif() |