Merge pull request #2125 from jszakmeister/fix-whitespace-third-party

third-party: fix whitespace and naming

third-party/CMakeLists.txt

@@ -13,7 +13,7 @@ set(DEPS_DOWNLOAD_DIR "${DEPS_BUILD_DIR}/downloads")
 
 option(USE_BUNDLED "Use bundled dependencies." ON)
 
-option(USE_BUNDLED_LIBUNIBILIUM "Use the bundled libunibilium." ${USE_BUNDLED})
+option(USE_BUNDLED_UNIBILIUM "Use the bundled unibilium." ${USE_BUNDLED})
 option(USE_BUNDLED_LIBTERMKEY "Use the bundled libtermkey." ${USE_BUNDLED})
 option(USE_BUNDLED_LIBVTERM "Use the bundled libvterm." ${USE_BUNDLED})
 option(USE_BUNDLED_LIBUV "Use the bundled libuv." ${USE_BUNDLED})
@@ -64,8 +64,8 @@ set(LUAJIT_SHA256 55be6cb2d101ed38acca32c5b1f99ae345904b365b642203194c585d27bebd
 set(LUAROCKS_URL https://github.com/keplerproject/luarocks/archive/0587afbb5fe8ceb2f2eea16f486bd6183bf02f29.tar.gz)
 set(LUAROCKS_SHA256 c8ad50938fed66beba74a73621d14121d4a40b796e01c45238de4cdcb47d5e0b)
 
-set(LIBUNIBILIUM_URL https://github.com/mauke/unibilium/archive/bb979ff6f66a18663e15d086dec6276561b86ee0.tar.gz)
-set(LIBUNIBILIUM_SHA256 bec06ea90128b46f28b91b8b52b861dede5f4ede0a92f05178b3c7bcec237dd1)
+set(UNIBILIUM_URL https://github.com/mauke/unibilium/archive/bb979ff6f66a18663e15d086dec6276561b86ee0.tar.gz)
+set(UNIBILIUM_SHA256 bec06ea90128b46f28b91b8b52b861dede5f4ede0a92f05178b3c7bcec237dd1)
 
 set(LIBTERMKEY_URL https://github.com/neovim/libtermkey/archive/8c0cb7108cc63218ea19aa898968eede19e19603.tar.gz)
 set(LIBTERMKEY_SHA256 21846369081e6c9a0b615f4b3889c4cb809321c5ccc6e6c1640eb138f1590072)
@@ -74,8 +74,8 @@ set(LIBVTERM_URL https://github.com/neovim/libvterm/archive/1b745d29d45623aa8d22
 set(LIBVTERM_SHA256 3fc75908256c0d158d6c2a32d39f34e86bfd26364f5404b7d9c03bb70cdc3611)
 
 
-if(USE_BUNDLED_LIBUNIBILIUM)
-  include(BuildLibunibilium)
+if(USE_BUNDLED_UNIBILIUM)
+  include(BuildUnibilium)
 endif()
 
 if(USE_BUNDLED_LIBTERMKEY)

third-party/cmake/BuildLibtermkey.cmake

@@ -1,4 +1,3 @@
-
 ExternalProject_Add(libtermkey
   PREFIX ${DEPS_BUILD_DIR}
   URL ${LIBTERMKEY_URL}
@@ -18,5 +17,6 @@ ExternalProject_Add(libtermkey
                               PKG_CONFIG_PATH=${DEPS_LIB_DIR}/pkgconfig
                               CFLAGS=-fPIC
                               install)
+
 list(APPEND THIRD_PARTY_DEPS libtermkey)
 add_dependencies(libtermkey libunibilium)

third-party/cmake/BuildLibuv.cmake

@@ -1,4 +1,3 @@
-
 ExternalProject_Add(libuv
   PREFIX ${DEPS_BUILD_DIR}
   URL ${LIBUV_URL}
@@ -15,5 +14,5 @@ ExternalProject_Add(libuv
       --prefix=${DEPS_INSTALL_DIR} --libdir=${DEPS_INSTALL_DIR}/lib
       CC=${DEPS_C_COMPILER}
   INSTALL_COMMAND ${MAKE_PRG} install)
-list(APPEND THIRD_PARTY_DEPS libuv)
 
+list(APPEND THIRD_PARTY_DEPS libuv)

third-party/cmake/BuildLibvterm.cmake

@@ -1,4 +1,3 @@
-
 ExternalProject_Add(libvterm
   PREFIX ${DEPS_BUILD_DIR}
   URL ${LIBVTERM_URL}
@@ -17,5 +16,5 @@ ExternalProject_Add(libvterm
                               PREFIX=${DEPS_INSTALL_DIR}
                               CFLAGS=-fPIC
                               install)
-list(APPEND THIRD_PARTY_DEPS libvterm)
 
+list(APPEND THIRD_PARTY_DEPS libvterm)

third-party/cmake/BuildLuajit.cmake

@@ -1,4 +1,3 @@
-
 ExternalProject_Add(luajit
   PREFIX ${DEPS_BUILD_DIR}
   URL ${LUAJIT_URL}
@@ -22,5 +21,5 @@ ExternalProject_Add(luajit
                               CCDEBUG+=-g
                               BUILDMODE=static
                               install)
-list(APPEND THIRD_PARTY_DEPS luajit)
 
+list(APPEND THIRD_PARTY_DEPS luajit)

third-party/cmake/BuildLuarocks.cmake

@@ -1,9 +1,9 @@
-
 if(USE_BUNDLED_LUAJIT)
   list(APPEND LUAROCKS_OPTS
     --with-lua=${DEPS_INSTALL_DIR}
     --with-lua-include=${DEPS_INSTALL_DIR}/include/luajit-2.0)
 endif()
+
 ExternalProject_Add(luarocks
   PREFIX ${DEPS_BUILD_DIR}
   URL ${LUAROCKS_URL}
@@ -21,7 +21,9 @@ ExternalProject_Add(luarocks
     --lua-suffix=jit
   BUILD_COMMAND ""
   INSTALL_COMMAND ${MAKE_PRG} bootstrap)
+
 list(APPEND THIRD_PARTY_DEPS luarocks)
+
 if(USE_BUNDLED_LUAJIT)
   add_dependencies(luarocks luajit)
 endif()
@@ -82,5 +84,3 @@ add_custom_target(nvim-client
   DEPENDS ${DEPS_LIB_DIR}/luarocks/rocks/nvim-client)
 
 list(APPEND THIRD_PARTY_DEPS stable-busted-deps busted lua-messagepack lpeg nvim-client)
-
-

third-party/cmake/BuildUnibilium.cmake

@@ -1,14 +1,13 @@
-
-ExternalProject_Add(libunibilium
+ExternalProject_Add(unibilium
   PREFIX ${DEPS_BUILD_DIR}
-  URL ${LIBUNIBILIUM_URL}
-  DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/libunibilium
+  URL ${UNIBILIUM_URL}
+  DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/unibilium
   DOWNLOAD_COMMAND ${CMAKE_COMMAND}
     -DPREFIX=${DEPS_BUILD_DIR}
-    -DDOWNLOAD_DIR=${DEPS_DOWNLOAD_DIR}/libunibilium
-    -DURL=${LIBUNIBILIUM_URL}
-    -DEXPECTED_SHA256=${LIBUNIBILIUM_SHA256}
-    -DTARGET=libunibilium
+    -DDOWNLOAD_DIR=${DEPS_DOWNLOAD_DIR}/unibilium
+    -DURL=${UNIBILIUM_URL}
+    -DEXPECTED_SHA256=${UNIBILIUM_SHA256}
+    -DTARGET=unibilium
     -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/DownloadAndExtractFile.cmake
   CONFIGURE_COMMAND ""
   BUILD_IN_SOURCE 1
@@ -16,5 +15,5 @@ ExternalProject_Add(libunibilium
                             PREFIX=${DEPS_INSTALL_DIR}
                             CFLAGS=-fPIC
   INSTALL_COMMAND ${MAKE_PRG} PREFIX=${DEPS_INSTALL_DIR} install)
-list(APPEND THIRD_PARTY_DEPS libunibilium)
 
+list(APPEND THIRD_PARTY_DEPS unibilium)