[llvm-commits] [llvm] r101177 - in /llvm/trunk/tools: CMakeLists.txt edis/CMakeLists.txt edis/EDInfo.td llvm-mc/CMakeLists.txt

[Ted Kremenek]

Author: kremenek
Date: Tue Apr 13 15:52:50 2010
New Revision: 101177

URL: http://llvm.org/viewvc/llvm-project?rev=101177&view=rev
Log:
Add CMake support for 'edis'.

Added:
    llvm/trunk/tools/edis/CMakeLists.txt
    llvm/trunk/tools/edis/EDInfo.td
Modified:
    llvm/trunk/tools/CMakeLists.txt
    llvm/trunk/tools/llvm-mc/CMakeLists.txt

Modified: llvm/trunk/tools/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/CMakeLists.txt?rev=101177&r1=101176&r2=101177&view=diff
==============================================================================
--- llvm/trunk/tools/CMakeLists.txt (original)
+++ llvm/trunk/tools/CMakeLists.txt Tue Apr 13 15:52:50 2010
@@ -31,6 +31,7 @@
 add_subdirectory(bugpoint)
 add_subdirectory(llvm-bcanalyzer)
 add_subdirectory(llvm-stub)
+add_subdirectory(edis)
 add_subdirectory(llvmc)
 
 if( EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/clang/CMakeLists.txt )

Added: llvm/trunk/tools/edis/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/edis/CMakeLists.txt?rev=101177&view=auto
==============================================================================
--- llvm/trunk/tools/edis/CMakeLists.txt (added)
+++ llvm/trunk/tools/edis/CMakeLists.txt Tue Apr 13 15:52:50 2010
@@ -0,0 +1,41 @@
+set(SHARED_LIBRARY TRUE)
+set(LLVM_NO_RTTI 1)
+
+add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/EDInfo.inc
+  COMMAND ${LLVM_TABLEGEN_EXE} -o ${CMAKE_CURRENT_BINARY_DIR}/EDInfo.inc
+          -gen-enhanced-disassembly-header ${CMAKE_CURRENT_SOURCE_DIR}/EDInfo.td
+  DEPENDS tblgen
+  COMMENT "Building enhanced disassembly semantic information header (EDInfo.inc)")
+set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/EDInfo.inc PROPERTIES GENERATED 1)
+
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+add_llvm_library(EnhancedDisassembly
+  EDDisassembler.cpp
+  EDInst.cpp
+  EDMain.cpp
+  EDOperand.cpp
+  EDToken.cpp
+  ../../include/llvm-c/EnhancedDisassembly.h
+  ${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

Added: llvm/trunk/tools/edis/EDInfo.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/edis/EDInfo.td?rev=101177&view=auto
==============================================================================
--- llvm/trunk/tools/edis/EDInfo.td (added)
+++ llvm/trunk/tools/edis/EDInfo.td Tue Apr 13 15:52:50 2010
@@ -0,0 +1 @@
+// Intentionally empty.

Modified: llvm/trunk/tools/llvm-mc/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-mc/CMakeLists.txt?rev=101177&r1=101176&r2=101177&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-mc/CMakeLists.txt (original)
+++ llvm/trunk/tools/llvm-mc/CMakeLists.txt Tue Apr 13 15:52:50 2010
@@ -1,3 +1,4 @@
+set( LLVM_USED_LIBS EnhancedDisassembly)
 set(LLVM_LINK_COMPONENTS ${LLVM_TARGETS_TO_BUILD} support MC MCParser)
 
 add_llvm_tool(llvm-mc