build: CMake: remove usage of USE_BUNDLED_X in main project (#10354)

The variables are not meant to be defined there really, but only with the third-party project. Using them, e.g. with the following, would actually result in libvterm not being found then: make CMAKE_EXTRA_FLAGS="-DUSE_BUNDLED_LIBVTERM=ON" \ DEPS_CMAKE_FLAGS="-DUSE_BUNDLED=OFF -DUSE_BUNDLED_LIBVTERM=ON" In https://github.com/neovim/neovim/pull/6357 they were renamed to `USE_BUNDLED_X` from `X_USE_BUNDLED`, but the above reasoning applies to the old names, too. Internally `CMAKE_PREFIX_PATH` is used to add the built/bundled third party packages for `find_package`, so there is no reason to e.g. query the values via `load_cache` for example from the third-party project.
2025-07-16 01:01:49 +00:00 · 2019-06-28 02:02:19 +02:00
parent 9f64e4b73f
commit 6765bbc651
6 changed files with 32 additions and 92 deletions
--- a/cmake/FindLibTermkey.cmake
+++ b/cmake/FindLibTermkey.cmake
@ -4,24 +4,15 @@
 #  LIBTERMKEY_INCLUDE_DIRS - The libtermkey include directories
 #  LIBTERMKEY_LIBRARIES - The libraries needed to use libtermkey

-if(NOT USE_BUNDLED_LIBTERMKEY)
-  find_package(PkgConfig)
-  if (PKG_CONFIG_FOUND)
-    pkg_check_modules(PC_LIBTERMKEY QUIET termkey)
-  endif()
-else()
-  set(PC_LIBTERMKEY_INCLUDEDIR)
-  set(PC_LIBTERMKEY_INCLUDE_DIRS)
-  set(PC_LIBTERMKEY_LIBDIR)
-  set(PC_LIBTERMKEY_LIBRARY_DIRS)
-  set(LIMIT_SEARCH NO_DEFAULT_PATH)
+find_package(PkgConfig)
+if (PKG_CONFIG_FOUND)
+  pkg_check_modules(PC_LIBTERMKEY QUIET termkey)
 endif()

 set(LIBTERMKEY_DEFINITIONS ${PC_LIBTERMKEY_CFLAGS_OTHER})

 find_path(LIBTERMKEY_INCLUDE_DIR termkey.h
-          PATHS ${PC_LIBTERMKEY_INCLUDEDIR} ${PC_LIBTERMKEY_INCLUDE_DIRS}
-          ${LIMIT_SEARCH})
+          PATHS ${PC_LIBTERMKEY_INCLUDEDIR} ${PC_LIBTERMKEY_INCLUDE_DIRS})

 # If we're asked to use static linkage, add libuv.a as a preferred library name.
 if(LIBTERMKEY_USE_STATIC)
@ -32,8 +23,7 @@ endif()
 list(APPEND LIBTERMKEY_NAMES termkey)

 find_library(LIBTERMKEY_LIBRARY NAMES ${LIBTERMKEY_NAMES}
-  HINTS ${PC_LIBTERMKEY_LIBDIR} ${PC_LIBTERMKEY_LIBRARY_DIRS}
-  ${LIMIT_SEARCH})
+  HINTS ${PC_LIBTERMKEY_LIBDIR} ${PC_LIBTERMKEY_LIBRARY_DIRS})

 set(LIBTERMKEY_LIBRARIES ${LIBTERMKEY_LIBRARY})
 set(LIBTERMKEY_INCLUDE_DIRS ${LIBTERMKEY_INCLUDE_DIR})
--- a/cmake/FindLibUV.cmake
+++ b/cmake/FindLibUV.cmake
@ -8,22 +8,13 @@
 # Set the LIBUV_USE_STATIC variable to specify if static libraries should
 # be preferred to shared ones.

-if(NOT USE_BUNDLED_LIBUV)
-  find_package(PkgConfig)
-  if (PKG_CONFIG_FOUND)
-    pkg_check_modules(PC_LIBUV QUIET libuv)
-  endif()
-else()
-  set(PC_LIBUV_INCLUDEDIR)
-  set(PC_LIBUV_INCLUDE_DIRS)
-  set(PC_LIBUV_LIBDIR)
-  set(PC_LIBUV_LIBRARY_DIRS)
-  set(LIMIT_SEARCH NO_DEFAULT_PATH)
+find_package(PkgConfig)
+if (PKG_CONFIG_FOUND)
+  pkg_check_modules(PC_LIBUV QUIET libuv)
 endif()

 find_path(LIBUV_INCLUDE_DIR uv.h
-  HINTS ${PC_LIBUV_INCLUDEDIR} ${PC_LIBUV_INCLUDE_DIRS}
-  ${LIMIT_SEARCH})
+  HINTS ${PC_LIBUV_INCLUDEDIR} ${PC_LIBUV_INCLUDE_DIRS})

 # If we're asked to use static linkage, add libuv.a as a preferred library name.
 if(LIBUV_USE_STATIC)
@ -34,8 +25,7 @@ endif(LIBUV_USE_STATIC)
 list(APPEND LIBUV_NAMES uv)

 find_library(LIBUV_LIBRARY NAMES ${LIBUV_NAMES}
-  HINTS ${PC_LIBUV_LIBDIR} ${PC_LIBUV_LIBRARY_DIRS}
-  ${LIMIT_SEARCH})
+  HINTS ${PC_LIBUV_LIBDIR} ${PC_LIBUV_LIBRARY_DIRS})

 mark_as_advanced(LIBUV_INCLUDE_DIR LIBUV_LIBRARY)

--- a/cmake/FindLibVterm.cmake
+++ b/cmake/FindLibVterm.cmake
@ -4,24 +4,15 @@
 #  LIBVTERM_INCLUDE_DIRS - The libvterm include directories
 #  LIBVTERM_LIBRARIES - The libraries needed to use libvterm

-if(NOT USE_BUNDLED_LIBVTERM)
-  find_package(PkgConfig)
-  if (PKG_CONFIG_FOUND)
-    pkg_check_modules(PC_LIBVTERM QUIET vterm)
-  endif()
-else()
-  set(PC_LIBVTERM_INCLUDEDIR)
-  set(PC_LIBVTERM_INCLUDE_DIRS)
-  set(PC_LIBVTERM_LIBDIR)
-  set(PC_LIBVTERM_LIBRARY_DIRS)
-  set(LIMIT_SEARCH NO_DEFAULT_PATH)
+find_package(PkgConfig)
+if (PKG_CONFIG_FOUND)
+  pkg_check_modules(PC_LIBVTERM QUIET vterm)
 endif()

 set(LIBVTERM_DEFINITIONS ${PC_LIBVTERM_CFLAGS_OTHER})

 find_path(LIBVTERM_INCLUDE_DIR vterm.h
-          PATHS ${PC_LIBVTERM_INCLUDEDIR} ${PC_LIBVTERM_INCLUDE_DIRS}
-          ${LIMIT_SEARCH})
+          PATHS ${PC_LIBVTERM_INCLUDEDIR} ${PC_LIBVTERM_INCLUDE_DIRS})

 # If we're asked to use static linkage, add libuv.a as a preferred library name.
 if(LIBVTERM_USE_STATIC)
@ -32,8 +23,7 @@ endif()
 list(APPEND LIBVTERM_NAMES vterm)

 find_library(LIBVTERM_LIBRARY NAMES ${LIBVTERM_NAMES}
-  HINTS ${PC_LIBVTERM_LIBDIR} ${PC_LIBVTERM_LIBRARY_DIRS}
-  ${LIMIT_SEARCH})
+  HINTS ${PC_LIBVTERM_LIBDIR} ${PC_LIBVTERM_LIBRARY_DIRS})

 set(LIBVTERM_LIBRARIES ${LIBVTERM_LIBRARY})
 set(LIBVTERM_INCLUDE_DIRS ${LIBVTERM_INCLUDE_DIR})
--- a/cmake/FindLuaJit.cmake
+++ b/cmake/FindLuaJit.cmake
@ -4,25 +4,16 @@
 #  LUAJIT_INCLUDE_DIRS - The luajit include directories
 #  LUAJIT_LIBRARIES - The libraries needed to use luajit

-if(NOT USE_BUNDLED_LUAJIT)
-  find_package(PkgConfig)
-  if (PKG_CONFIG_FOUND)
-    pkg_check_modules(PC_LUAJIT QUIET luajit)
-  endif()
-else()
-  set(PC_LUAJIT_INCLUDEDIR)
-  set(PC_LUAJIT_INCLUDE_DIRS)
-  set(PC_LUAJIT_LIBDIR)
-  set(PC_LUAJIT_LIBRARY_DIRS)
-  set(LIMIT_SEARCH NO_DEFAULT_PATH)
+find_package(PkgConfig)
+if (PKG_CONFIG_FOUND)
+  pkg_check_modules(PC_LUAJIT QUIET luajit)
 endif()

 set(LUAJIT_DEFINITIONS ${PC_LUAJIT_CFLAGS_OTHER})

 find_path(LUAJIT_INCLUDE_DIR luajit.h
          PATHS ${PC_LUAJIT_INCLUDEDIR} ${PC_LUAJIT_INCLUDE_DIRS}
-          PATH_SUFFIXES luajit-2.0
-          ${LIMIT_SEARCH})
+          PATH_SUFFIXES luajit-2.0)

 # If we're asked to use static linkage, add libluajit-5.1.a as a preferred
 # library name.
@ -40,8 +31,7 @@ else()
 endif()

 find_library(LUAJIT_LIBRARY NAMES ${LUAJIT_NAMES}
-             PATHS ${PC_LUAJIT_LIBDIR} ${PC_LUAJIT_LIBRARY_DIRS}
-             ${LIMIT_SEARCH})
+             PATHS ${PC_LUAJIT_LIBDIR} ${PC_LUAJIT_LIBRARY_DIRS})

 set(LUAJIT_LIBRARIES ${LUAJIT_LIBRARY})
 set(LUAJIT_INCLUDE_DIRS ${LUAJIT_INCLUDE_DIR})
--- a/cmake/FindMsgpack.cmake
+++ b/cmake/FindMsgpack.cmake
@ -4,26 +4,17 @@
 #  MSGPACK_INCLUDE_DIRS - The msgpack include directories
 #  MSGPACK_LIBRARIES - The libraries needed to use msgpack

-if(NOT USE_BUNDLED_MSGPACK)
-  find_package(PkgConfig)
-  if (PKG_CONFIG_FOUND)
-    pkg_search_module(PC_MSGPACK QUIET
-      msgpackc>=${Msgpack_FIND_VERSION}
-      msgpack>=${Msgpack_FIND_VERSION})
-  endif()
-else()
-  set(PC_MSGPACK_INCLUDEDIR)
-  set(PC_MSGPACK_INCLUDE_DIRS)
-  set(PC_MSGPACK_LIBDIR)
-  set(PC_MSGPACK_LIBRARY_DIRS)
-  set(LIMIT_SEARCH NO_DEFAULT_PATH)
+find_package(PkgConfig)
+if (PKG_CONFIG_FOUND)
+  pkg_search_module(PC_MSGPACK QUIET
+    msgpackc>=${Msgpack_FIND_VERSION}
+    msgpack>=${Msgpack_FIND_VERSION})
 endif()

 set(MSGPACK_DEFINITIONS ${PC_MSGPACK_CFLAGS_OTHER})

 find_path(MSGPACK_INCLUDE_DIR msgpack/version_master.h
-  HINTS ${PC_MSGPACK_INCLUDEDIR} ${PC_MSGPACK_INCLUDE_DIRS}
-  ${LIMIT_SEARCH})
+  HINTS ${PC_MSGPACK_INCLUDEDIR} ${PC_MSGPACK_INCLUDE_DIRS})

 if(MSGPACK_INCLUDE_DIR)
  file(READ ${MSGPACK_INCLUDE_DIR}/msgpack/version_master.h msgpack_version_h)
@ -53,8 +44,7 @@ find_library(MSGPACK_LIBRARY NAMES ${MSGPACK_NAMES}
  # Check each directory for all names to avoid using headers/libraries from
  # different places.
  NAMES_PER_DIR
-  HINTS ${PC_MSGPACK_LIBDIR} ${PC_MSGPACK_LIBRARY_DIRS}
-  ${LIMIT_SEARCH})
+  HINTS ${PC_MSGPACK_LIBDIR} ${PC_MSGPACK_LIBRARY_DIRS})

 mark_as_advanced(MSGPACK_INCLUDE_DIR MSGPACK_LIBRARY)

--- a/cmake/FindUnibilium.cmake
+++ b/cmake/FindUnibilium.cmake
@ -4,24 +4,15 @@
 #  UNIBILIUM_INCLUDE_DIRS - The unibilium include directories
 #  UNIBILIUM_LIBRARIES - The libraries needed to use unibilium

-if(NOT USE_BUNDLED_UNIBILIUM)
-  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)
+find_package(PkgConfig)
+if (PKG_CONFIG_FOUND)
+  pkg_check_modules(PC_UNIBILIUM QUIET unibilium)
 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})
+          PATHS ${PC_UNIBILIUM_INCLUDEDIR} ${PC_UNIBILIUM_INCLUDE_DIRS})

 # If we're asked to use static linkage, add libunibilium.a as a preferred library name.
 if(UNIBILIUM_USE_STATIC)
@ -32,8 +23,7 @@ endif()
 list(APPEND UNIBILIUM_NAMES unibilium)

 find_library(UNIBILIUM_LIBRARY NAMES ${UNIBILIUM_NAMES}
-  HINTS ${PC_UNIBILIUM_LIBDIR} ${PC_UNIBILIUM_LIBRARY_DIRS}
-  ${LIMIT_SEARCH})
+  HINTS ${PC_UNIBILIUM_LIBDIR} ${PC_UNIBILIUM_LIBRARY_DIRS})

 set(UNIBILIUM_LIBRARIES ${UNIBILIUM_LIBRARY})
 set(UNIBILIUM_INCLUDE_DIRS ${UNIBILIUM_INCLUDE_DIR})