diff options
| author | Chandler Carruth <chandlerc@gmail.com> | 2011-09-04 23:32:05 +0000 |
|---|---|---|
| committer | Chandler Carruth <chandlerc@gmail.com> | 2011-09-04 23:32:05 +0000 |
| commit | 908abc34396d0d5b324c0d0419edd12727db8dbd (patch) | |
| tree | 5124dcd1fe5cdac2aab40263494d297d17779382 /llvm | |
| parent | ada9aa2b98347eb46b1370b131738d7640803438 (diff) | |
| download | bcm5719-llvm-908abc34396d0d5b324c0d0419edd12727db8dbd.tar.gz bcm5719-llvm-908abc34396d0d5b324c0d0419edd12727db8dbd.zip | |
As a (rather delayed) followup to r136738 which stopped building the
edis shared library in the Makefile build, also stop building it in the
CMake build.
Patch by arrowdodger!
llvm-svn: 139108
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/tools/edis/CMakeLists.txt | 28 |
1 files changed, 5 insertions, 23 deletions
diff --git a/llvm/tools/edis/CMakeLists.txt b/llvm/tools/edis/CMakeLists.txt index 71f25348705..1e162f93183 100644 --- a/llvm/tools/edis/CMakeLists.txt +++ b/llvm/tools/edis/CMakeLists.txt @@ -13,27 +13,9 @@ if( LLVM_TARGETS_TO_BUILD MATCHES ARM ) list(APPEND EDIS_DEPENDS LLVMARMAsmPrinter LLVMARMAsmParser LLVMARMDisassembler LLVMARMDesc) endif() -# TODO: Process EnhancedDisassembly.exports +add_llvm_library(EnhancedDisassembly ${SOURCES}) +set_property(TARGET EnhancedDisassembly PROPERTY + OUTPUT_NAME "EnhancedDisassembly") -if( NOT WIN32 AND LLVM_ENABLE_PIC ) - set(bsl ${BUILD_SHARED_LIBS}) - set(BUILD_SHARED_LIBS ON) - add_llvm_library(EnhancedDisassembly ${SOURCES}) - add_llvm_library_dependencies(EnhancedDisassembly ${EDIS_DEPENDS}) - set_property(TARGET EnhancedDisassembly PROPERTY - OUTPUT_NAME "EnhancedDisassembly") - set(BUILD_SHARED_LIBS ${bsl}) - set(EnhancedDisassembly_STATIC_TARGET_NAME EnhancedDisassembly_static) -else() - set(EnhancedDisassembly_STATIC_TARGET_NAME EnhancedDisassembly) -endif() - -if( NOT BUILD_SHARED_LIBS ) - add_llvm_library(${EnhancedDisassembly_STATIC_TARGET_NAME} ${SOURCES}) - set_property(TARGET ${EnhancedDisassembly_STATIC_TARGET_NAME} PROPERTY - OUTPUT_NAME "EnhancedDisassembly") - - add_llvm_library_dependencies(${EnhancedDisassembly_STATIC_TARGET_NAME} - ${EDIS_DEPENDS}) - -endif() +add_llvm_library_dependencies(EnhancedDisassembly + ${EDIS_DEPENDS}) |
