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 | fec0c6fa56d5ed91d5b6a1f286aa84b205e17a0f (patch) | |
| tree | ecfa12ca752e355e2288a6a4e49daf25bd4cd419 /tools/edis | |
| parent | 4c07bfb21941188b75d07df47fb0186a5daea7af (diff) | |
| download | llvm-fec0c6fa56d5ed91d5b6a1f286aa84b205e17a0f.tar.gz llvm-fec0c6fa56d5ed91d5b6a1f286aa84b205e17a0f.tar.bz2 llvm-fec0c6fa56d5ed91d5b6a1f286aa84b205e17a0f.tar.xz | |
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!
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@139108 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools/edis')
| -rw-r--r-- | tools/edis/CMakeLists.txt | 28 |
1 files changed, 5 insertions, 23 deletions
diff --git a/tools/edis/CMakeLists.txt b/tools/edis/CMakeLists.txt index 71f2534870..1e162f9318 100644 --- a/tools/edis/CMakeLists.txt +++ b/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}) |