aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Walch <florian@fwalch.com>2015-04-19 22:51:31 +0300
committerFlorian Walch <florian@fwalch.com>2015-04-29 22:26:55 +0300
commit07d4142a18c889c03b499e6db73f915e1d724d96 (patch)
tree2b0ea1e6241c67482f453e5e6d6a880cbcda9828
parent45b617afada9304cb265aad02645b22d76dfc2d5 (diff)
downloadrneovim-07d4142a18c889c03b499e6db73f915e1d724d96.tar.gz
rneovim-07d4142a18c889c03b499e6db73f915e1d724d96.tar.bz2
rneovim-07d4142a18c889c03b499e6db73f915e1d724d96.zip
CMake: Refer to Unibilium instead of LibUnibilium.
-rw-r--r--CMakeLists.txt6
-rw-r--r--cmake/FindLibUnibilium.cmake48
-rw-r--r--cmake/FindUnibilium.cmake48
-rw-r--r--src/nvim/CMakeLists.txt2
4 files changed, 52 insertions, 52 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2879b57061..cf5d63a8d9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -190,9 +190,9 @@ include_directories(SYSTEM ${MSGPACK_INCLUDE_DIRS})
find_package(LuaJit REQUIRED)
include_directories(SYSTEM ${LUAJIT_INCLUDE_DIRS})
-option(LIBUNIBILIUM_USE_STATIC "Use static libunibilium" ON)
-find_package(LibUnibilium REQUIRED)
-include_directories(SYSTEM ${LIBUNIBILIUM_INCLUDE_DIRS})
+option(UNIBILIUM_USE_STATIC "Use static unibilium" ON)
+find_package(Unibilium REQUIRED)
+include_directories(SYSTEM ${UNIBILIUM_INCLUDE_DIRS})
option(LIBTERMKEY_USE_STATIC "Use static libtermkey" ON)
find_package(LibTermkey REQUIRED)
diff --git a/cmake/FindLibUnibilium.cmake b/cmake/FindLibUnibilium.cmake
deleted file mode 100644
index 6aafd07c90..0000000000
--- a/cmake/FindLibUnibilium.cmake
+++ /dev/null
@@ -1,48 +0,0 @@
-# - Try to find libunibilium
-# Once done this will define
-# LIBUNIBILIUM_FOUND - System has libunibilium
-# LIBUNIBILIUM_INCLUDE_DIRS - The libunibilium include directories
-# LIBUNIBILIUM_LIBRARIES - The libraries needed to use libunibilium
-
-find_package(PkgConfig)
-if(NOT LIBUNIBILIUM_USE_BUNDLED)
- find_package(PkgConfig)
- if (PKG_CONFIG_FOUND)
- pkg_check_modules(PC_LIBUNIBILIUM QUIET unibilium)
- endif()
-else()
- set(PC_LIBUNIBILIUM_INCLUDEDIR)
- set(PC_LIBUNIBILIUM_INCLUDE_DIRS)
- set(PC_LIBUNIBILIUM_LIBDIR)
- set(PC_LIBUNIBILIUM_LIBRARY_DIRS)
- set(LIMIT_SEARCH NO_DEFAULT_PATH)
-endif()
-
-set(LIBUNIBILIUM_DEFINITIONS ${PC_LIBUNIBILIUM_CFLAGS_OTHER})
-
-find_path(LIBUNIBILIUM_INCLUDE_DIR unibilium.h
- PATHS ${PC_LIBUNIBILIUM_INCLUDEDIR} ${PC_LIBUNIBILIUM_INCLUDE_DIRS}
- ${LIMIT_SEARCH})
-
-# If we're asked to use static linkage, add libuv.a as a preferred library name.
-if(LIBUNIBILIUM_USE_STATIC)
- list(APPEND LIBUNIBILIUM_NAMES
- "${CMAKE_STATIC_LIBRARY_PREFIX}unibilium${CMAKE_STATIC_LIBRARY_SUFFIX}")
-endif()
-
-list(APPEND LIBUNIBILIUM_NAMES unibilium)
-
-find_library(LIBUNIBILIUM_LIBRARY NAMES ${LIBUNIBILIUM_NAMES}
- HINTS ${PC_LIBUNIBILIUM_LIBDIR} ${PC_LIBUNIBILIUM_LIBRARY_DIRS}
- ${LIMIT_SEARCH})
-
-set(LIBUNIBILIUM_LIBRARIES ${LIBUNIBILIUM_LIBRARY})
-set(LIBUNIBILIUM_INCLUDE_DIRS ${LIBUNIBILIUM_INCLUDE_DIR})
-
-include(FindPackageHandleStandardArgs)
-# handle the QUIETLY and REQUIRED arguments and set LIBUNIBILIUM_FOUND to TRUE
-# if all listed variables are TRUE
-find_package_handle_standard_args(LibUnibilium DEFAULT_MSG
- LIBUNIBILIUM_LIBRARY LIBUNIBILIUM_INCLUDE_DIR)
-
-mark_as_advanced(LIBUNIBILIUM_INCLUDE_DIR LIBUNIBILIUM_LIBRARY)
diff --git a/cmake/FindUnibilium.cmake b/cmake/FindUnibilium.cmake
new file mode 100644
index 0000000000..3cb7dacef8
--- /dev/null
+++ b/cmake/FindUnibilium.cmake
@@ -0,0 +1,48 @@
+# - Try to find unibilium
+# Once done this will define
+# UNIBILIUM_FOUND - System has unibilium
+# UNIBILIUM_INCLUDE_DIRS - The unibilium include directories
+# UNIBILIUM_LIBRARIES - The libraries needed to use unibilium
+
+find_package(PkgConfig)
+if(NOT UNIBILIUM_USE_BUNDLED)
+ find_package(PkgConfig)
+ if (PKG_CONFIG_FOUND)
+ pkg_check_modules(PC_UNIBILIUM QUIET unibilium)
+ endif()
+else()
+ set(PC_UNIBILIUM_INCLUDEDIR)
+ set(PC_UNIBILIUM_INCLUDE_DIRS)
+ set(PC_UNIBILIUM_LIBDIR)
+ set(PC_UNIBILIUM_LIBRARY_DIRS)
+ set(LIMIT_SEARCH NO_DEFAULT_PATH)
+endif()
+
+set(UNIBILIUM_DEFINITIONS ${PC_UNIBILIUM_CFLAGS_OTHER})
+
+find_path(UNIBILIUM_INCLUDE_DIR unibilium.h
+ PATHS ${PC_UNIBILIUM_INCLUDEDIR} ${PC_UNIBILIUM_INCLUDE_DIRS}
+ ${LIMIT_SEARCH})
+
+# If we're asked to use static linkage, add libunibilium.a as a preferred library name.
+if(UNIBILIUM_USE_STATIC)
+ list(APPEND UNIBILIUM_NAMES
+ "${CMAKE_STATIC_LIBRARY_PREFIX}unibilium${CMAKE_STATIC_LIBRARY_SUFFIX}")
+endif()
+
+list(APPEND UNIBILIUM_NAMES unibilium)
+
+find_library(UNIBILIUM_LIBRARY NAMES ${UNIBILIUM_NAMES}
+ HINTS ${PC_UNIBILIUM_LIBDIR} ${PC_UNIBILIUM_LIBRARY_DIRS}
+ ${LIMIT_SEARCH})
+
+set(UNIBILIUM_LIBRARIES ${UNIBILIUM_LIBRARY})
+set(UNIBILIUM_INCLUDE_DIRS ${UNIBILIUM_INCLUDE_DIR})
+
+include(FindPackageHandleStandardArgs)
+# handle the QUIETLY and REQUIRED arguments and set UNIBILIUM_FOUND to TRUE
+# if all listed variables are TRUE
+find_package_handle_standard_args(unibilium DEFAULT_MSG
+ UNIBILIUM_LIBRARY UNIBILIUM_INCLUDE_DIR)
+
+mark_as_advanced(UNIBILIUM_INCLUDE_DIR UNIBILIUM_LIBRARY)
diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt
index 31612c7f47..fa1f81cdd1 100644
--- a/src/nvim/CMakeLists.txt
+++ b/src/nvim/CMakeLists.txt
@@ -163,7 +163,7 @@ list(APPEND NVIM_LINK_LIBRARIES
${LUAJIT_LIBRARIES}
${LIBVTERM_LIBRARIES}
${LIBTERMKEY_LIBRARIES}
- ${LIBUNIBILIUM_LIBRARIES}
+ ${UNIBILIUM_LIBRARIES}
m
util
${CMAKE_THREAD_LIBS_INIT}