This is an archive of the discontinued LLVM Phabricator instance.

Correctly include LLVM_EXTERNAL_CLANG_SOURCE_DIR.
ClosedPublic

Authored by chaoren on Oct 28 2015, 5:39 PM.

Reviewers

sas
ovyalov

Commits

chaoren retitled this revision from to Correctly include LLVM_EXTERNAL_CLANG_SOURCE_DIR..

chaoren updated this object.

chaoren added reviewers: sas, ovyalov.

chaoren added a subscriber: lldb-commits.

LGTM

This revision is now accepted and ready to land.Oct 28 2015, 5:44 PM

This revision was automatically updated to reflect the committed changes.

Thanks for fixing this. Didn't test external LLVM builds.

Path

Size

cmake/

modules/

6 lines

	Show First 20 Lines • Show All 188 Lines • ▼ Show 20 Lines
	endif()			endif()

	if (LLDB_DISABLE_PYTHON)			if (LLDB_DISABLE_PYTHON)
	unset(PYTHON_INCLUDE_DIRS)			unset(PYTHON_INCLUDE_DIRS)
	unset(PYTHON_LIBRARY)			unset(PYTHON_LIBRARY)
	add_definitions( -DLLDB_DISABLE_PYTHON )			add_definitions( -DLLDB_DISABLE_PYTHON )
	endif()			endif()

				if (LLVM_EXTERNAL_CLANG_SOURCE_DIR)
				include_directories(${LLVM_EXTERNAL_CLANG_SOURCE_DIR}/include)
				else ()
	include_directories(${CMAKE_SOURCE_DIR}/tools/clang/include)			include_directories(${CMAKE_SOURCE_DIR}/tools/clang/include)
				endif ()
	include_directories("${CMAKE_CURRENT_BINARY_DIR}/../clang/include")			include_directories("${CMAKE_CURRENT_BINARY_DIR}/../clang/include")

	# Disable GCC warnings			# Disable GCC warnings
	check_cxx_compiler_flag("-Wno-deprecated-declarations"			check_cxx_compiler_flag("-Wno-deprecated-declarations"
	CXX_SUPPORTS_NO_DEPRECATED_DECLARATIONS)			CXX_SUPPORTS_NO_DEPRECATED_DECLARATIONS)
	if (CXX_SUPPORTS_NO_DEPRECATED_DECLARATIONS)			if (CXX_SUPPORTS_NO_DEPRECATED_DECLARATIONS)
	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations")			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations")
	endif ()			endif ()
	▲ Show 20 Lines • Show All 187 Lines • Show Last 20 Lines