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

diff --git a/tools/edis/CMakeLists.txt b/tools/edis/CMakeLists.txt
index 71f25348705685c369886f7cc2947dfee3e197ca..1e162f93183ffa3dab6184661535b19ce8e84b1d 100644 (file)
--- 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})