diff options
| author | dundargoc <33953936+dundargoc@users.noreply.github.com> | 2023-01-24 09:36:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-24 09:36:32 +0100 |
| commit | 993dc6e97e895d2afbc2ff75c77f50db1ba810cd (patch) | |
| tree | 2de440ebbfc5f11514d31f497ba48aa32902f67c | |
| parent | bcbdb94185168048fe7140d9fe3d8eafeff7d9da (diff) | |
| download | rneovim-993dc6e97e895d2afbc2ff75c77f50db1ba810cd.tar.gz rneovim-993dc6e97e895d2afbc2ff75c77f50db1ba810cd.tar.bz2 rneovim-993dc6e97e895d2afbc2ff75c77f50db1ba810cd.zip | |
build: use upstream CMakeLists.txt for unibilium (#21976)
Also remove UnibiliumCMakeLists.txt as it's not necessary anymore.
| -rw-r--r-- | cmake.deps/cmake/BuildUnibilium.cmake | 3 | ||||
| -rw-r--r-- | cmake.deps/cmake/UnibiliumCMakeLists.txt | 29 |
2 files changed, 0 insertions, 32 deletions
diff --git a/cmake.deps/cmake/BuildUnibilium.cmake b/cmake.deps/cmake/BuildUnibilium.cmake index e76e39a148..dd42480a75 100644 --- a/cmake.deps/cmake/BuildUnibilium.cmake +++ b/cmake.deps/cmake/BuildUnibilium.cmake @@ -6,9 +6,6 @@ ExternalProject_Add(unibilium URL_HASH SHA256=${UNIBILIUM_SHA256} DOWNLOAD_NO_PROGRESS TRUE DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/unibilium - PATCH_COMMAND ${CMAKE_COMMAND} -E copy - ${CMAKE_CURRENT_SOURCE_DIR}/cmake/UnibiliumCMakeLists.txt - ${DEPS_BUILD_DIR}/src/unibilium/CMakeLists.txt CMAKE_ARGS -DCMAKE_GENERATOR=${CMAKE_GENERATOR} -DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM} diff --git a/cmake.deps/cmake/UnibiliumCMakeLists.txt b/cmake.deps/cmake/UnibiliumCMakeLists.txt deleted file mode 100644 index e22c07cb3d..0000000000 --- a/cmake.deps/cmake/UnibiliumCMakeLists.txt +++ /dev/null @@ -1,29 +0,0 @@ -cmake_minimum_required(VERSION 3.10) -project(unibilium LANGUAGES C) - -file(GLOB SRC_FILES ${PROJECT_SOURCE_DIR}/*.c) -add_library(unibilium ${SRC_FILES}) -set_target_properties(unibilium PROPERTIES PUBLIC_HEADER ${PROJECT_SOURCE_DIR}/unibilium.h - VERSION "${VERSION_MAJOR}.${VERSION_MINOR}") - -if(NOT WIN32) - execute_process(COMMAND sh -c "ncursesw6-config --terminfo-dirs 2>/dev/null || \ - ncurses6-config --terminfo-dirs 2>/dev/null || \ - ncursesw5-config --terminfo-dirs 2>/dev/null || \ - ncurses5-config --terminfo-dirs 2>/dev/null || \ - echo '/etc/terminfo:/lib/terminfo:/usr/share/terminfo:/usr/lib/terminfo:/usr/local/share/terminfo:/usr/local/lib/terminfo'" - OUTPUT_VARIABLE TERMINFO_DIRS) - # Remove trailing newline - string(STRIP "${TERMINFO_DIRS}" TERMINFO_DIRS) -else() - set(TERMINFO_DIRS "") -endif() -target_compile_definitions(unibilium PUBLIC "TERMINFO_DIRS=\"${TERMINFO_DIRS}\"") - -include(GNUInstallDirs) -install(TARGETS unibilium - PUBLIC_HEADER - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) - -# vim: set ft=cmake: |