diff options
| author | Chris Bieneman <beanz@apple.com> | 2015-05-29 18:34:41 +0000 |
|---|---|---|
| committer | Chris Bieneman <beanz@apple.com> | 2015-05-29 18:34:41 +0000 |
| commit | 7c445dd6c7dd356fe36889ab0b0f03295e328283 (patch) | |
| tree | 66cdc435dd6d1505cfdee3adc7dbb8ccfc95b3e6 /llvm/cmake/modules | |
| parent | e19faeed71a2f559659b60c0ffd2db7e17f4ee0c (diff) | |
| download | bcm5719-llvm-7c445dd6c7dd356fe36889ab0b0f03295e328283.tar.gz bcm5719-llvm-7c445dd6c7dd356fe36889ab0b0f03295e328283.zip | |
[CMake] Bug 23468 - LLVM_OPTIMIZED_TABLEGEN does not work with Visual Studio
Summary: Multi-configuration builds put their binaries into ${CMAKE_BINARY_DIR}/Release/bin/. The table-gen cross-compilation support needs to take that into account.
Reviewers: yaron.keren
Reviewed By: yaron.keren
Subscribers: llvm-commits
Differential Revision: http://reviews.llvm.org/D10102
llvm-svn: 238592
Diffstat (limited to 'llvm/cmake/modules')
| -rw-r--r-- | llvm/cmake/modules/TableGen.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/llvm/cmake/modules/TableGen.cmake b/llvm/cmake/modules/TableGen.cmake index 97e272b04a5..85d720e91fd 100644 --- a/llvm/cmake/modules/TableGen.cmake +++ b/llvm/cmake/modules/TableGen.cmake @@ -94,7 +94,11 @@ macro(add_tablegen target project) if(LLVM_USE_HOST_TOOLS) if( ${${project}_TABLEGEN} STREQUAL "${target}" ) - set(${project}_TABLEGEN_EXE "${LLVM_NATIVE_BUILD}/bin/${target}") + if (NOT CMAKE_CONFIGURATION_TYPES) + set(${project}_TABLEGEN_EXE "${LLVM_NATIVE_BUILD}/bin/${target}") + else() + set(${project}_TABLEGEN_EXE "${LLVM_NATIVE_BUILD}/Release/bin/${target}") + endif() set(${project}_TABLEGEN_EXE ${${project}_TABLEGEN_EXE} PARENT_SCOPE) add_custom_command(OUTPUT ${${project}_TABLEGEN_EXE} |
