[llvm-branch-commits] [llvm-branch] r303413 - Merging r297403:

[Tom Stellard via llvm-branch-commits]

Author: tstellar
Date: Fri May 19 05:13:18 2017
New Revision: 303413

URL: http://llvm.org/viewvc/llvm-project?rev=303413&view=rev
Log:
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
------------------------------------------------------------------------

Modified:
    llvm/branches/release_40/cmake/modules/TableGen.cmake

Modified: llvm/branches/release_40/cmake/modules/TableGen.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_40/cmake/modules/TableGen.cmake?rev=303413&r1=303412&r2=303413&view=diff
==============================================================================
--- llvm/branches/release_40/cmake/modules/TableGen.cmake (original)
+++ llvm/branches/release_40/cmake/modules/TableGen.cmake Fri May 19 05:13:18 2017
@@ -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