Commit c564b936 authored May 19, 2017 by Tom Stellard

Merging r297403:

------------------------------------------------------------------------
r297403 | tstellar | 2017-03-09 14:24:07 -0500 (Thu, 09 Mar 2017) | 17 lines

CMake: Don't install llvm-tblgen twice

Summary:
The add_tablegen macros defines its own install target, and it was also calling
add_llvm_utility which adds another install target.

Configuring with -DLLVM_TOOLS_INSTALL_DIR set to something other than
'bin' along with -DLLVM_INSTALL_UTILS=ON was causing llvm-tablgen
to be installed to two separate directories.

Reviewers: beanz, hans

Reviewed By: beanz

Subscribers: llvm-commits, mgorny

Differential Revision: https://reviews.llvm.org/D30656
------------------------------------------------------------------------

llvm-svn: 303413

parent 42ee3ff3

llvm/cmake/modules/TableGen.cmake

+1 −1

Original line number	Diff line number	Diff line
		@@ -92,7 +92,7 @@ macro(add_tablegen target project)
		set(LLVM_ENABLE_OBJLIB ON)
		endif()

		add_llvm_utility(${target} ${ARGN})
		add_llvm_executable(${target} DISABLE_LLVM_LINK_LLVM_DYLIB ${ARGN})
		set(LLVM_LINK_COMPONENTS ${${target}_OLD_LLVM_LINK_COMPONENTS})

		set(${project}_TABLEGEN "${target}" CACHE