This is an archive of the discontinued LLVM Phabricator instance.

Fix project name conflict for MSBuild
ClosedPublic

Authored by jonathanmeier on Jan 13 2016, 12:06 PM.

Download Raw Diff

Details

Reviewers

Commits

rGd79bc3266848: Rename MSVC top-level folder to avoid name collision.
rLLDB257684: Rename MSVC top-level folder to avoid name collision.
rL257684: Rename MSVC top-level folder to avoid name collision.

Summary

CMake allows case sensitive folder naming when setting the folder property of a target. However MSBuild doesn't like that. It complains about having two projects named the same when trying to compile the solution and aborts. (Solution file error MSB5004: The solution file has two projects named "lldb tests")

In lldb/unittests/CMakeLists.txt a folder "LLDB tests" is defined and in lldb/lit/CMakeLists.txt a folder "lldb tests" is defined.

Renaming "lldb tests" to "LLDB tests" in lldb/lit/CMakeLists.txt fixes the problem.

Diff Detail

Repository: rL LLVM

Event Timeline

jonathanmeier updated this revision to Diff 44775.Jan 13 2016, 12:06 PM

jonathanmeier retitled this revision from to Fix project name conflict for MSBuild.

jonathanmeier updated this object.

jonathanmeier added a reviewer: zturner.

jonathanmeier added a subscriber: lldb-commits.

looks good, thanks

This revision is now accepted and ready to land.Jan 13 2016, 12:36 PM

Could you please commit that for me? I don't have write access to the repository.

Closed by commit rL257684: Rename MSVC top-level folder to avoid name collision. (authored by zturner). · Explain WhyJan 13 2016, 2:04 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents

Path

Size

lldb/

trunk/

lit/

CMakeLists.txt

2 lines

Diff 44787

lldb/trunk/lit/CMakeLists.txt

	Show All 27 Lines

	add_lit_testsuite(check-lldb-unit "Running lldb unit test suite"			add_lit_testsuite(check-lldb-unit "Running lldb unit test suite"
	${CMAKE_CURRENT_BINARY_DIR}			${CMAKE_CURRENT_BINARY_DIR}
	PARAMS lldb_site_config=${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg			PARAMS lldb_site_config=${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg
	lldb_unit_site_config=${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg			lldb_unit_site_config=${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg
	DEPENDS ${LLDB_TEST_DEPS}			DEPENDS ${LLDB_TEST_DEPS}
	)			)

	set_target_properties(check-lldb-unit PROPERTIES FOLDER "lldb tests")			set_target_properties(check-lldb-unit PROPERTIES FOLDER "LLDB tests")