mirror of
				https://github.com/neovim/neovim.git
				synced 2025-11-04 01:34:25 +00:00 
			
		
		
		
	build: clean up / remove X_USE_STATIC (#10713)
This was discouraged (as an option) in 5b5d353151 [1], not enabled/used by
default, and not working according to the comment in local.mk.example.
Taken out of https://github.com/neovim/neovim/pull/10395.
1: https://github.com/neovim/neovim/pull/2465
			
			
This commit is contained in:
		@@ -14,12 +14,6 @@ set(LIBLUV_DEFINITIONS ${PC_LIBLUV_CFLAGS_OTHER})
 | 
				
			|||||||
find_path(LIBLUV_INCLUDE_DIR luv/luv.h
 | 
					find_path(LIBLUV_INCLUDE_DIR luv/luv.h
 | 
				
			||||||
          PATHS ${PC_LIBLUV_INCLUDEDIR} ${PC_LIBLUV_INCLUDE_DIRS})
 | 
					          PATHS ${PC_LIBLUV_INCLUDEDIR} ${PC_LIBLUV_INCLUDE_DIRS})
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# If we're asked to use static linkage, add libluv.a as a preferred library name.
 | 
					 | 
				
			||||||
if(LIBLUV_USE_STATIC)
 | 
					 | 
				
			||||||
  list(APPEND LIBLUV_NAMES
 | 
					 | 
				
			||||||
    "${CMAKE_STATIC_LIBRARY_PREFIX}luv${CMAKE_STATIC_LIBRARY_SUFFIX}")
 | 
					 | 
				
			||||||
endif()
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
list(APPEND LIBLUV_NAMES luv)
 | 
					list(APPEND LIBLUV_NAMES luv)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
find_library(LIBLUV_LIBRARY NAMES ${LIBLUV_NAMES}
 | 
					find_library(LIBLUV_LIBRARY NAMES ${LIBLUV_NAMES}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -14,12 +14,6 @@ set(LIBTERMKEY_DEFINITIONS ${PC_LIBTERMKEY_CFLAGS_OTHER})
 | 
				
			|||||||
find_path(LIBTERMKEY_INCLUDE_DIR termkey.h
 | 
					find_path(LIBTERMKEY_INCLUDE_DIR termkey.h
 | 
				
			||||||
          PATHS ${PC_LIBTERMKEY_INCLUDEDIR} ${PC_LIBTERMKEY_INCLUDE_DIRS})
 | 
					          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)
 | 
					 | 
				
			||||||
  list(APPEND LIBTERMKEY_NAMES
 | 
					 | 
				
			||||||
    "${CMAKE_STATIC_LIBRARY_PREFIX}termkey${CMAKE_STATIC_LIBRARY_SUFFIX}")
 | 
					 | 
				
			||||||
endif()
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
list(APPEND LIBTERMKEY_NAMES termkey)
 | 
					list(APPEND LIBTERMKEY_NAMES termkey)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
find_library(LIBTERMKEY_LIBRARY NAMES ${LIBTERMKEY_NAMES}
 | 
					find_library(LIBTERMKEY_LIBRARY NAMES ${LIBTERMKEY_NAMES}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -4,9 +4,6 @@
 | 
				
			|||||||
#  LIBUV_FOUND - system has libuv
 | 
					#  LIBUV_FOUND - system has libuv
 | 
				
			||||||
#  LIBUV_INCLUDE_DIRS - the libuv include directories
 | 
					#  LIBUV_INCLUDE_DIRS - the libuv include directories
 | 
				
			||||||
#  LIBUV_LIBRARIES - link these to use libuv
 | 
					#  LIBUV_LIBRARIES - link these to use libuv
 | 
				
			||||||
#
 | 
					 | 
				
			||||||
# Set the LIBUV_USE_STATIC variable to specify if static libraries should
 | 
					 | 
				
			||||||
# be preferred to shared ones.
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
find_package(PkgConfig)
 | 
					find_package(PkgConfig)
 | 
				
			||||||
if (PKG_CONFIG_FOUND)
 | 
					if (PKG_CONFIG_FOUND)
 | 
				
			||||||
@@ -16,12 +13,6 @@ endif()
 | 
				
			|||||||
find_path(LIBUV_INCLUDE_DIR uv.h
 | 
					find_path(LIBUV_INCLUDE_DIR uv.h
 | 
				
			||||||
  HINTS ${PC_LIBUV_INCLUDEDIR} ${PC_LIBUV_INCLUDE_DIRS})
 | 
					  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)
 | 
					 | 
				
			||||||
  list(APPEND LIBUV_NAMES
 | 
					 | 
				
			||||||
    "${CMAKE_STATIC_LIBRARY_PREFIX}uv${CMAKE_STATIC_LIBRARY_SUFFIX}")
 | 
					 | 
				
			||||||
endif(LIBUV_USE_STATIC)
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
list(APPEND LIBUV_NAMES uv)
 | 
					list(APPEND LIBUV_NAMES uv)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
find_library(LIBUV_LIBRARY NAMES ${LIBUV_NAMES}
 | 
					find_library(LIBUV_LIBRARY NAMES ${LIBUV_NAMES}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -14,12 +14,6 @@ set(LIBVTERM_DEFINITIONS ${PC_LIBVTERM_CFLAGS_OTHER})
 | 
				
			|||||||
find_path(LIBVTERM_INCLUDE_DIR vterm.h
 | 
					find_path(LIBVTERM_INCLUDE_DIR vterm.h
 | 
				
			||||||
          PATHS ${PC_LIBVTERM_INCLUDEDIR} ${PC_LIBVTERM_INCLUDE_DIRS})
 | 
					          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)
 | 
					 | 
				
			||||||
  list(APPEND LIBVTERM_NAMES
 | 
					 | 
				
			||||||
    "${CMAKE_STATIC_LIBRARY_PREFIX}vterm${CMAKE_STATIC_LIBRARY_SUFFIX}")
 | 
					 | 
				
			||||||
endif()
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
list(APPEND LIBVTERM_NAMES vterm)
 | 
					list(APPEND LIBVTERM_NAMES vterm)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
find_library(LIBVTERM_LIBRARY NAMES ${LIBVTERM_NAMES}
 | 
					find_library(LIBVTERM_LIBRARY NAMES ${LIBVTERM_NAMES}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -15,13 +15,6 @@ find_path(LUAJIT_INCLUDE_DIR luajit.h
 | 
				
			|||||||
          PATHS ${PC_LUAJIT_INCLUDEDIR} ${PC_LUAJIT_INCLUDE_DIRS}
 | 
					          PATHS ${PC_LUAJIT_INCLUDEDIR} ${PC_LUAJIT_INCLUDE_DIRS}
 | 
				
			||||||
          PATH_SUFFIXES luajit-2.0 luajit-2.1)
 | 
					          PATH_SUFFIXES luajit-2.0 luajit-2.1)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# If we're asked to use static linkage, add libluajit-5.1.a as a preferred
 | 
					 | 
				
			||||||
# library name.
 | 
					 | 
				
			||||||
if(LUAJIT_USE_STATIC)
 | 
					 | 
				
			||||||
  list(APPEND LUAJIT_NAMES
 | 
					 | 
				
			||||||
    "${CMAKE_STATIC_LIBRARY_PREFIX}luajit-5.1${CMAKE_STATIC_LIBRARY_SUFFIX}")
 | 
					 | 
				
			||||||
endif()
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
if(MSVC)
 | 
					if(MSVC)
 | 
				
			||||||
  list(APPEND LUAJIT_NAMES lua51)
 | 
					  list(APPEND LUAJIT_NAMES lua51)
 | 
				
			||||||
elseif(MINGW)
 | 
					elseif(MINGW)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -26,13 +26,6 @@ else()
 | 
				
			|||||||
  set(MSGPACK_VERSION_STRING)
 | 
					  set(MSGPACK_VERSION_STRING)
 | 
				
			||||||
endif()
 | 
					endif()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# If we're asked to use static linkage, add libmsgpack{,c}.a as a preferred library name.
 | 
					 | 
				
			||||||
if(MSGPACK_USE_STATIC)
 | 
					 | 
				
			||||||
  list(APPEND MSGPACK_NAMES
 | 
					 | 
				
			||||||
    "${CMAKE_STATIC_LIBRARY_PREFIX}msgpackc${CMAKE_STATIC_LIBRARY_SUFFIX}"
 | 
					 | 
				
			||||||
    "${CMAKE_STATIC_LIBRARY_PREFIX}msgpack${CMAKE_STATIC_LIBRARY_SUFFIX}")
 | 
					 | 
				
			||||||
endif()
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
if(MSVC)
 | 
					if(MSVC)
 | 
				
			||||||
  # The import library for the msgpack DLL has a different name
 | 
					  # The import library for the msgpack DLL has a different name
 | 
				
			||||||
  list(APPEND MSGPACK_NAMES msgpackc_import)
 | 
					  list(APPEND MSGPACK_NAMES msgpackc_import)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -47,18 +47,6 @@
 | 
				
			|||||||
#
 | 
					#
 | 
				
			||||||
# DEPS_CMAKE_FLAGS += -DUSE_BUNDLED=OFF
 | 
					# DEPS_CMAKE_FLAGS += -DUSE_BUNDLED=OFF
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# By default, bundled libraries are statically linked to nvim.
 | 
					 | 
				
			||||||
# This has no effect for non-bundled deps, which are always dynamically linked.
 | 
					 | 
				
			||||||
# Uncomment these entries to instead use dynamic linking.
 | 
					 | 
				
			||||||
#
 | 
					 | 
				
			||||||
# CMAKE_EXTRA_FLAGS += -DLIBTERMKEY_USE_STATIC=OFF
 | 
					 | 
				
			||||||
# CMAKE_EXTRA_FLAGS += -DLIBUNIBILIUM_USE_STATIC=OFF
 | 
					 | 
				
			||||||
# CMAKE_EXTRA_FLAGS += -DLIBUV_USE_STATIC=OFF
 | 
					 | 
				
			||||||
# CMAKE_EXTRA_FLAGS += -DLIBVTERM_USE_STATIC=OFF
 | 
					 | 
				
			||||||
# CMAKE_EXTRA_FLAGS += -DLUAJIT_USE_STATIC=OFF
 | 
					 | 
				
			||||||
# CMAKE_EXTRA_FLAGS += -DMSGPACK_USE_STATIC=OFF
 | 
					 | 
				
			||||||
#
 | 
					 | 
				
			||||||
#
 | 
					 | 
				
			||||||
# .DEFAULT_GOAL := nvim
 | 
					# .DEFAULT_GOAL := nvim
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# Run doxygen over the source code.
 | 
					# Run doxygen over the source code.
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user