This is an archive of the discontinued LLVM Phabricator instance.

CMake: Make libxml2 show up in --system-libs (PR36660)
ClosedPublic

Authored by hans on Mar 9 2018, 6:40 AM.

Download Raw Diff

Details

Reviewers

Commits

rGee95ffd075a7: Merging r327135:
rG14b7e1890916: CMake: Make libxml2 show up in --system-libs (PR36660)
rL329482: Merging r327135:
rL327135: CMake: Make libxml2 show up in --system-libs (PR36660)

Summary

lib/WindowsManifest/CMakeLists.txt adds it to LLVM_SYSTEM_LIBS on that
target, but it was never getting picked up in
tools/llvm-config/CMakeLists.txt.

Diff Detail

Repository: rL LLVM

Event Timeline

hans created this revision.Mar 9 2018, 6:40 AM

Herald added a subscriber: mgorny. · View Herald TranscriptMar 9 2018, 6:40 AM

thakis accepted this revision.Mar 9 2018, 6:46 AM

This revision is now accepted and ready to land.Mar 9 2018, 6:46 AM

Closed by commit rL327135: CMake: Make libxml2 show up in --system-libs (PR36660) (authored by hans). · Explain WhyMar 9 2018, 6:50 AM

This revision was automatically updated to reflect the committed changes.

Revision Contents

Path

Size

llvm/

trunk/

tools/

llvm-config/

CMakeLists.txt

5 lines

Diff 137745

llvm/trunk/tools/llvm-config/CMakeLists.txt

	set(LLVM_LINK_COMPONENTS support)			set(LLVM_LINK_COMPONENTS support)

	set(BUILDVARIABLES_SRCPATH ${CMAKE_CURRENT_SOURCE_DIR}/BuildVariables.inc.in)			set(BUILDVARIABLES_SRCPATH ${CMAKE_CURRENT_SOURCE_DIR}/BuildVariables.inc.in)
	set(BUILDVARIABLES_OBJPATH ${CMAKE_CURRENT_BINARY_DIR}/BuildVariables.inc)			set(BUILDVARIABLES_OBJPATH ${CMAKE_CURRENT_BINARY_DIR}/BuildVariables.inc)

	# Add the llvm-config tool.			# Add the llvm-config tool.
	add_llvm_tool(llvm-config			add_llvm_tool(llvm-config
	llvm-config.cpp			llvm-config.cpp
	)			)

	# Compute the substitution values for various items.			# Compute the substitution values for various items.
	get_property(LLVM_SYSTEM_LIBS_LIST TARGET LLVMSupport PROPERTY LLVM_SYSTEM_LIBS)			get_property(SUPPORT_SYSTEM_LIBS TARGET LLVMSupport PROPERTY LLVM_SYSTEM_LIBS)
	foreach(l ${LLVM_SYSTEM_LIBS_LIST})			get_property(WINDOWSMANIFEST_SYSTEM_LIBS TARGET LLVMWindowsManifest PROPERTY LLVM_SYSTEM_LIBS)
				foreach(l ${SUPPORT_SYSTEM_LIBS} ${WINDOWSMANIFEST_SYSTEM_LIBS})
	if(MSVC)			if(MSVC)
	set(SYSTEM_LIBS ${SYSTEM_LIBS} "${l}.lib")			set(SYSTEM_LIBS ${SYSTEM_LIBS} "${l}.lib")
	else()			else()
	if (l MATCHES "^-")			if (l MATCHES "^-")
	# If it's an option, pass it without changes.			# If it's an option, pass it without changes.
	set(SYSTEM_LIBS ${SYSTEM_LIBS} "${l}")			set(SYSTEM_LIBS ${SYSTEM_LIBS} "${l}")
	else()			else()
	# Otherwise assume it's a library name we need to link with.			# Otherwise assume it's a library name we need to link with.
	▲ Show 20 Lines • Show All 59 Lines • Show Last 20 Lines