[llvm-commits] [llvm] r101188 - in /llvm/trunk: lib/Target/ARM/CMakeLists.txt lib/Target/X86/CMakeLists.txt tools/edis/CMakeLists.txt

[Douglas Gregor]

Author: dgregor
Date: Tue Apr 13 17:47:43 2010
New Revision: 101188

URL: http://llvm.org/viewvc/llvm-project?rev=101188&view=rev
Log:
Unbreak CMake build by improving the EnhancedDisassembly makefile a
bit (we're not trying to build a shared library yet) and generating
the X86GenEDInfo.inc and ARMGenEDInfo.inc files as necessary.

Modified:
    llvm/trunk/lib/Target/ARM/CMakeLists.txt
    llvm/trunk/lib/Target/X86/CMakeLists.txt
    llvm/trunk/tools/edis/CMakeLists.txt

Modified: llvm/trunk/lib/Target/ARM/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/CMakeLists.txt?rev=101188&r1=101187&r2=101188&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/CMakeLists.txt (original)
+++ llvm/trunk/lib/Target/ARM/CMakeLists.txt Tue Apr 13 17:47:43 2010
@@ -10,6 +10,7 @@
 tablegen(ARMGenDAGISel.inc -gen-dag-isel)
 tablegen(ARMGenCallingConv.inc -gen-callingconv)
 tablegen(ARMGenSubtarget.inc -gen-subtarget)
+tablegen(ARMGenEDInfo.inc -gen-enhanced-disassembly-info)
 
 add_llvm_target(ARMCodeGen
   ARMBaseInstrInfo.cpp

Modified: llvm/trunk/lib/Target/X86/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/CMakeLists.txt?rev=101188&r1=101187&r2=101188&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/CMakeLists.txt (original)
+++ llvm/trunk/lib/Target/X86/CMakeLists.txt Tue Apr 13 17:47:43 2010
@@ -13,6 +13,7 @@
 tablegen(X86GenFastISel.inc -gen-fast-isel)
 tablegen(X86GenCallingConv.inc -gen-callingconv)
 tablegen(X86GenSubtarget.inc -gen-subtarget)
+tablegen(X86GenEDInfo.inc -gen-enhanced-disassembly-info)
 
 set(sources
   SSEDomainFix.cpp

Modified: llvm/trunk/tools/edis/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/edis/CMakeLists.txt?rev=101188&r1=101187&r2=101188&view=diff
==============================================================================
--- llvm/trunk/tools/edis/CMakeLists.txt (original)
+++ llvm/trunk/tools/edis/CMakeLists.txt Tue Apr 13 17:47:43 2010
@@ -1,4 +1,3 @@
-set(SHARED_LIBRARY TRUE)
 set(LLVM_NO_RTTI 1)
 
 add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/EDInfo.inc
@@ -20,22 +19,7 @@
   ${CMAKE_CURRENT_BINARY_DIR}/EDInfo.inc
 )
 
-if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-  # FIXME: Deal with EDIS version?
-  set_target_properties(EnhancedDisassembly
-    PROPERTIES
-    LINK_FLAGS "-avoid-version -Wl,-exported_symbols_list -Wl,${CMAKE_CURRENT_SOURCE_DIR}/EnhancedDisassembly.exports -Wl,-dead_strip -Wl"
-    )
-endif()
-
-if(MSVC)
-  # windows.h doesn't compile with /Za
-  get_target_property(NON_ANSI_COMPILE_FLAGS CIndex COMPILE_FLAGS)
-  string(REPLACE /Za "" NON_ANSI_COMPILE_FLAGS ${NON_ANSI_COMPILE_FLAGS})
-  set_target_properties(EnhancedDisassembly PROPERTIES COMPILE_FLAGS ${NON_ANSI_COMPILE_FLAGS})
-endif(MSVC)
-
 set_target_properties(EnhancedDisassembly
   PROPERTIES
   LINKER_LANGUAGE CXX)
-  
\ No newline at end of file
+