[llvm-commits] [llvm] r139108 - /llvm/trunk/tools/edis/CMakeLists.txt

[Chandler Carruth]

Author: chandlerc
Date: Sun Sep  4 18:32:05 2011
New Revision: 139108

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

Modified:
    llvm/trunk/tools/edis/CMakeLists.txt

Modified: llvm/trunk/tools/edis/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/edis/CMakeLists.txt?rev=139108&r1=139107&r2=139108&view=diff
==============================================================================
--- llvm/trunk/tools/edis/CMakeLists.txt (original)
+++ llvm/trunk/tools/edis/CMakeLists.txt Sun Sep  4 18:32:05 2011
@@ -13,27 +13,9 @@
   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})