diff options
| author | dundargoc <33953936+dundargoc@users.noreply.github.com> | 2023-03-02 10:22:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-02 10:22:41 +0100 |
| commit | a0292b4e5f106482edc5623eef85aa48e2e55bb7 (patch) | |
| tree | b6bb2056bbcc34217e7edfc88cca4f494a4f2b05 /src | |
| parent | fb1db80f5ab707e188be3c60539fa38eaf996f24 (diff) | |
| download | rneovim-a0292b4e5f106482edc5623eef85aa48e2e55bb7.tar.gz rneovim-a0292b4e5f106482edc5623eef85aa48e2e55bb7.tar.bz2 rneovim-a0292b4e5f106482edc5623eef85aa48e2e55bb7.zip | |
build: remove libfindmacros library (#22423)
Large parts the library weren't being used, and the parts that were was overly
abstracted for our use case. Additionally, part of its use case was to abstract
pkgconfig boilerplate, which is no longer needed as pkgconfig has been removed
in favor of relying on cmake alone in 09118052cee5aef978d6075db5287c1b6c27381a.
Diffstat (limited to 'src')
| -rwxr-xr-x | src/nvim/CMakeLists.txt | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt index 8884273649..9bd79a6ba7 100755 --- a/src/nvim/CMakeLists.txt +++ b/src/nvim/CMakeLists.txt @@ -25,29 +25,31 @@ set_target_properties(luv PROPERTIES IMPORTED_LOCATION ${LIBLUV_LIBRARIES}) target_link_libraries(main_lib INTERFACE luv) find_package(TreeSitter REQUIRED) -target_include_directories(main_lib SYSTEM BEFORE INTERFACE ${TreeSitter_INCLUDE_DIRS}) -target_link_libraries(main_lib INTERFACE ${TreeSitter_LIBRARIES}) +target_include_directories(main_lib SYSTEM BEFORE INTERFACE ${TreeSitter_INCLUDE_DIR}) +target_link_libraries(main_lib INTERFACE ${TreeSitter_LIBRARY}) find_package(unibilium 2.0 REQUIRED) target_link_libraries(main_lib INTERFACE unibilium) find_package(LibTermkey 0.22 REQUIRED) -target_include_directories(main_lib SYSTEM BEFORE INTERFACE ${LIBTERMKEY_INCLUDE_DIRS}) -target_link_libraries(main_lib INTERFACE ${LIBTERMKEY_LIBRARIES}) +target_include_directories(main_lib SYSTEM BEFORE INTERFACE ${LIBTERMKEY_INCLUDE_DIR}) +target_link_libraries(main_lib INTERFACE ${LIBTERMKEY_LIBRARY}) find_package(libvterm 0.3 REQUIRED) target_link_libraries(main_lib INTERFACE libvterm) find_package(Iconv REQUIRED) -target_include_directories(main_lib SYSTEM BEFORE INTERFACE ${Iconv_INCLUDE_DIRS}) -target_link_libraries(main_lib INTERFACE ${Iconv_LIBRARIES}) +target_include_directories(main_lib SYSTEM BEFORE INTERFACE ${ICONV_INCLUDE_DIR}) +if(ICONV_LIBRARY) + target_link_libraries(main_lib INTERFACE ${ICONV_LIBRARY}) +endif() option(ENABLE_LIBINTL "enable libintl" ON) if(ENABLE_LIBINTL) # LibIntl (not Intl) selects our FindLibIntl.cmake script. #8464 find_package(LibIntl REQUIRED) - target_include_directories(main_lib SYSTEM BEFORE INTERFACE ${LibIntl_INCLUDE_DIRS}) - if (LibIntl_FOUND) + target_include_directories(main_lib SYSTEM BEFORE INTERFACE ${LibIntl_INCLUDE_DIR}) + if (LibIntl_LIBRARY) target_link_libraries(main_lib INTERFACE ${LibIntl_LIBRARY}) endif() endif() |