diff options
| author |   Tom Stellard <tstellar@redhat.com> | 2017-05-19 10:13:18 +0000 |
|---|---|---|
| committer | Tom Stellard <tstellar@redhat.com> | 2017-05-19 10:13:18 +0000 |
| commit | c564b936c18ecf389c9c56062a098d1a5106a499 (patch) | |
| tree | 26d8811db62ba343455cfb1bbfef8682f66fc6ab | |
| parent | Merging r294690: (diff) | |
| download | llvm-project-c564b936c18ecf389c9c56062a098d1a5106a499.tar.gz llvm-project-c564b936c18ecf389c9c56062a098d1a5106a499.tar.bz2 llvm-project-c564b936c18ecf389c9c56062a098d1a5106a499.zip | |
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
| -rw-r--r-- | llvm/cmake/modules/TableGen.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/cmake/modules/TableGen.cmake b/llvm/cmake/modules/TableGen.cmake index 9682002c2abd..3bb8aaab4073 100644 --- a/llvm/cmake/modules/TableGen.cmake +++ b/llvm/cmake/modules/TableGen.cmake @@ -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 |