diff options
| author | Daniel Hahler <git@thequod.de> | 2019-09-06 23:39:41 +0200 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2019-09-06 14:39:41 -0700 |
| commit | 16b64c339e98f23967396dfd85fd28105af6c587 (patch) | |
| tree | db1bfdfe874321fb6e6b602c45e7031560d4001e | |
| parent | 754ea8d27e92fafeed4890ba5bc523dcbebecc76 (diff) | |
| download | rneovim-16b64c339e98f23967396dfd85fd28105af6c587.tar.gz rneovim-16b64c339e98f23967396dfd85fd28105af6c587.tar.bz2 rneovim-16b64c339e98f23967396dfd85fd28105af6c587.zip | |
build: rename CMake find modules for LibFindMacros #10928
We are using "LIBFOO" prefixes for `LIBFOO_INCLUDE_DIRS` etc, and
therefore need to use this for the PREFIX with LibFindMacros also, so
that `"${${PREFIX}_FIND_VERSION}"` gets handled there properly.
The alternative would be to either manually handle/set the upper/mixed case
variants of those variable additionally, which is not as easy.
Keeping the existing names is useful for packagers.
Before this the version requirements with
`find_package(Unibilium 2.0 REQUIRED)` was not handled (a49cf5126), and
it prepares for using a required version with libvterm
(initially/wrongly ported in 1896c72a5).
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | cmake/FindLIBVTERM.cmake (renamed from cmake/FindLibVterm.cmake) | 0 | ||||
| -rw-r--r-- | cmake/FindUNIBILIUM.cmake (renamed from cmake/FindUnibilium.cmake) | 0 |
3 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3b7c593450..ea4e1e08f2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -408,7 +408,7 @@ endif() option(FEAT_TUI "Enable the Terminal UI" ON) if(FEAT_TUI) - find_package(Unibilium 2.0 REQUIRED) + find_package(UNIBILIUM 2.0 REQUIRED) include_directories(SYSTEM ${UNIBILIUM_INCLUDE_DIRS}) list(APPEND CMAKE_REQUIRED_INCLUDES "${UNIBILIUM_INCLUDE_DIRS}") @@ -432,7 +432,7 @@ if(FEAT_TUI) include_directories(SYSTEM ${LIBTERMKEY_INCLUDE_DIRS}) endif() -find_package(LibVterm REQUIRED) +find_package(LIBVTERM REQUIRED) include_directories(SYSTEM ${LIBVTERM_INCLUDE_DIRS}) if(WIN32) diff --git a/cmake/FindLibVterm.cmake b/cmake/FindLIBVTERM.cmake index 469494ddfd..469494ddfd 100644 --- a/cmake/FindLibVterm.cmake +++ b/cmake/FindLIBVTERM.cmake diff --git a/cmake/FindUnibilium.cmake b/cmake/FindUNIBILIUM.cmake index 0bf27b45e2..0bf27b45e2 100644 --- a/cmake/FindUnibilium.cmake +++ b/cmake/FindUNIBILIUM.cmake |