This is an archive of the discontinued LLVM Phabricator instance.

Make unittests include path relative
ClosedPublic

Authored by sebastian-ne on Jan 27 2020, 5:44 AM.

Download Raw Diff

Details

Reviewers

chandlerc
stoklund
nhaehnle

Commits

rGe5eeb8465f29: Make unittests include path relative

Summary

This change is relevant when embedding the llvm cmake project into
another project. It should not change the build behavior of a normal
llvm build.

In the case where llvm is embedded as a cmake subproject,
CMAKE_SOURCE_DIR does not point to the expected directory and building
the tests fails.
Using CMAKE_CURRENT_SOURCE_DIR fixes this problem, as it will always
point to the same directory.

Diff Detail

Repository: rG LLVM Github Monorepo

Event Timeline

sebastian-ne created this revision.Jan 27 2020, 5:44 AM

Herald added a project: Restricted Project. · View Herald TranscriptJan 27 2020, 5:44 AM

Herald added subscribers: llvm-commits, mgorny. · View Herald Transcript

Harbormaster completed remote builds in B44989: Diff 240541.Jan 27 2020, 5:44 AM

Is someone willing to review this?

LGTM

This revision is now accepted and ready to land.Feb 20 2020, 7:59 AM

Closed by commit rGe5eeb8465f29: Make unittests include path relative (authored by sebastian-ne). · Explain WhyFeb 21 2020, 1:26 AM

This revision was automatically updated to reflect the committed changes.

Revision Contents

Path

Size

llvm/

unittests/

TableGen/

CMakeLists.txt

2 lines

Diff 245804

llvm/unittests/TableGen/CMakeLists.txt

	set(LLVM_LINK_COMPONENTS			set(LLVM_LINK_COMPONENTS
	TableGen			TableGen
	Support			Support
	)			)

	set(LLVM_TARGET_DEFINITIONS Automata.td)			set(LLVM_TARGET_DEFINITIONS Automata.td)

	tablegen(LLVM AutomataTables.inc -gen-searchable-tables)			tablegen(LLVM AutomataTables.inc -gen-searchable-tables)
	tablegen(LLVM AutomataAutomata.inc -gen-automata)			tablegen(LLVM AutomataAutomata.inc -gen-automata)
	add_public_tablegen_target(AutomataTestTableGen)			add_public_tablegen_target(AutomataTestTableGen)

	add_llvm_unittest(TableGenTests			add_llvm_unittest(TableGenTests
	CodeExpanderTest.cpp			CodeExpanderTest.cpp
	AutomataTest.cpp			AutomataTest.cpp
	)			)
	include_directories(${CMAKE_SOURCE_DIR}/utils/TableGen)			include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../utils/TableGen)
	target_link_libraries(TableGenTests PRIVATE LLVMTableGenGlobalISel LLVMTableGen)			target_link_libraries(TableGenTests PRIVATE LLVMTableGenGlobalISel LLVMTableGen)