This is an archive of the discontinued LLVM Phabricator instance.

Make sure the projects subdirectory doesn't contain the clang or clang-tools-extra projects
AbandonedPublic

Authored by hintonda on Feb 7 2016, 8:01 AM.

Download Raw Diff

Details

Reviewers

mclow.lists
beanz

Summary

A common error for new users is to checkout subprojects, like clang or clang-tools-extra, into the wrong subdirectory. This change helps prevent this, since the resulting build would otherwise be unusable.

Diff Detail

Event Timeline

hintonda updated this revision to Diff 47132.Feb 7 2016, 8:01 AM

hintonda retitled this revision from to Make sure the projects subdirectory doesn't contain the clang or clang-tools-extra projects.

hintonda updated this object.

hintonda added reviewers: beanz, mclow.lists.

hintonda added a subscriber: cfe-commits.

reames edited subscribers, added: llvm-commits; removed: cfe-commits.Feb 7 2016, 10:22 AM

hintonda updated this object.Feb 8 2016, 7:47 AM

ping...

hintonda abandoned this revision.Apr 17 2016, 9:33 PM

Revision Contents

Path

Size

projects/

CMakeLists.txt

8 lines

Diff 47132

projects/CMakeLists.txt

	# Discover the projects that use CMake in the subdirectories.			# Discover the projects that use CMake in the subdirectories.
	# Note that explicit cmake invocation is required every time a new project is			# Note that explicit cmake invocation is required every time a new project is
	# added or removed.			# added or removed.
	file(GLOB entries *)			file(GLOB entries *)
	foreach(entry ${entries})			foreach(entry ${entries})
	if(IS_DIRECTORY ${entry} AND EXISTS ${entry}/CMakeLists.txt)			if(IS_DIRECTORY ${entry} AND EXISTS ${entry}/CMakeLists.txt)
				# Do not allow tools like clang or clang-tools-extra in the projects directory
				if(${entry} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/clang)
				message(FATAL_ERROR "clang must be placed under llvm/tools, not llvm/projects")
				endif()
				if((${entry} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/extra) OR
				(${entry} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/clang-tools-extra))
				message(FATAL_ERROR "clang-tools-extra (extra) must be placed under llvm/tools/clang/tools, not llvm/projects")
				endif()
	if((NOT ${entry} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/compiler-rt) AND			if((NOT ${entry} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/compiler-rt) AND
	(NOT ${entry} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/dragonegg) AND			(NOT ${entry} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/dragonegg) AND
	(NOT ${entry} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/libcxx) AND			(NOT ${entry} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/libcxx) AND
	(NOT ${entry} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/libcxxabi) AND			(NOT ${entry} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/libcxxabi) AND
	(NOT ${entry} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/libunwind) AND			(NOT ${entry} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/libunwind) AND
	(NOT ${entry} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/test-suite))			(NOT ${entry} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/test-suite))
	add_subdirectory(${entry})			add_subdirectory(${entry})
	endif()			endif()
	Show All 21 Lines