Update CMake build system for ARM NEON generation.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@106220 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/Basic/CMakeLists.txt b/include/clang/Basic/CMakeLists.txt
index c88278aed1b8cb12da765ef7ac76dc38a122449e..c5952365d59318b55b38b57c432469e16a6ce82f 100644 (file)
--- a/include/clang/Basic/CMakeLists.txt
+++ b/include/clang/Basic/CMakeLists.txt
@@ -25,3 +25,8 @@ tablegen(AttrList.inc
          -I ${CMAKE_CURRENT_SOURCE_DIR}/../../)
 add_custom_target(ClangAttrList
   DEPENDS AttrList.inc)
+
+# ARM NEON
+set(LLVM_TARGET_DEFINITIONS arm_neon.td)
+tablegen(arm_neon.inc -gen-arm-neon-sema)
+add_custom_target(ClangARMNeon DEPENDS arm_neon.inc)

diff --git a/lib/AST/CMakeLists.txt b/lib/AST/CMakeLists.txt
index 16abc65abb2b0b52a94a221715c6b4cd023f8235..4e09a9b8fcf3c3fd372aea26c991496ba69a3659 100644 (file)
--- a/lib/AST/CMakeLists.txt
+++ b/lib/AST/CMakeLists.txt
@@ -39,5 +39,5 @@ add_clang_library(clangAST
   TypePrinter.cpp
   )
 
-add_dependencies(clangAST ClangAttrClasses ClangAttrList ClangDiagnosticAST
-                 ClangDeclNodes ClangStmtNodes)
+add_dependencies(clangAST ClangARMNeon ClangAttrClasses ClangAttrList 
+                 ClangDiagnosticAST ClangDeclNodes ClangStmtNodes)

diff --git a/lib/Basic/CMakeLists.txt b/lib/Basic/CMakeLists.txt
index b46d8fc9a6abdf921420c2864d80c167bb934df0..87bf834c27520190d7603a6c802ecbed228bc184 100644 (file)
--- a/lib/Basic/CMakeLists.txt
+++ b/lib/Basic/CMakeLists.txt
@@ -25,6 +25,7 @@ if (Subversion_FOUND AND EXISTS "${CLANG_SOURCE_DIR}/.svn")
 endif()
 
 add_dependencies(clangBasic 
+                 ClangARMNeon
                  ClangAttrList
                  ClangDiagnosticAnalysis
                  ClangDiagnosticAST
@@ -35,3 +36,4 @@ add_dependencies(clangBasic
                  ClangDiagnosticLex
                  ClangDiagnosticParse
                  ClangDiagnosticSema)
+                 

diff --git a/lib/Headers/CMakeLists.txt b/lib/Headers/CMakeLists.txt
index 883b60a2a6db677c116fb61ce3ef196f9e71b8f5..97a99d676e878c3a801d088ab5889db0a29e2ff3 100644 (file)
--- a/lib/Headers/CMakeLists.txt
+++ b/lib/Headers/CMakeLists.txt
@@ -22,9 +22,8 @@ else ()
 endif ()
 
 # Generate arm_neon.h
-set(LLVM_TARGET_DEFINITIONS arm_neon.td)
+set(LLVM_TARGET_DEFINITIONS ${CLANG_SOURCE_DIR}/include/clang/Basic/arm_neon.td)
 tablegen(arm_neon.h.inc -gen-arm-neon)
-add_custom_target(ClangARMNeon DEPENDS arm_neon.h.inc)
 
 add_custom_command(OUTPUT ${output_dir}/arm_neon.h 
   DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/arm_neon.h.inc

diff --git a/lib/Sema/CMakeLists.txt b/lib/Sema/CMakeLists.txt
index baaac4ce32cc1401e539d9f5949ec8de7b9478a0..70b4792f3ba519bdd7cda18372c1e983eb5603df 100644 (file)
--- a/lib/Sema/CMakeLists.txt
+++ b/lib/Sema/CMakeLists.txt
@@ -34,5 +34,5 @@ add_clang_library(clangSema
   TargetAttributesSema.cpp
   )
 
-add_dependencies(clangSema ClangAttrClasses ClangAttrList ClangDiagnosticSema
-                 ClangDeclNodes ClangStmtNodes)
+add_dependencies(clangSema ClangARMNeon ClangAttrClasses ClangAttrList 
+                 ClangDiagnosticSema ClangDeclNodes ClangStmtNodes)