Really fix cmake style builds.

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

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 12ea2aa9fbcc37c19965785e02a530bb2fa5a612..e3da531011eebebd113991514e446e221bfdcd51 100644 (file)
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -7,4 +7,5 @@ add_subdirectory(Sema)
 add_subdirectory(CodeGen)
 add_subdirectory(Analysis)
 add_subdirectory(Rewrite)
+add_subdirectory(Driver)
 add_subdirectory(Frontend)

diff --git a/lib/Driver/CMakeLists.txt b/lib/Driver/CMakeLists.txt
index bd4c9fde7699a27a10d684d3724433172374bf47..7147d8f0be6007c467cc7697bb7b219184eee01c 100644 (file)
--- a/lib/Driver/CMakeLists.txt
+++ b/lib/Driver/CMakeLists.txt
@@ -7,8 +7,13 @@ add_clang_library(clangDriver
   Compilation.cpp
   Driver.cpp
   HostInfo.cpp
+  Job.cpp
   OptTable.cpp
   Option.cpp
   Phases.cpp
+  Tool.cpp
+  ToolChain.cpp
+  ToolChains.cpp
+  Tools.cpp
   Types.cpp
   )

diff --git a/lib/Frontend/CMakeLists.txt b/lib/Frontend/CMakeLists.txt
index 2ff67953f7e66103d9d9b9f869c9b8f2b219d8ee..680a9a8fc9af9338cdac32633e6e8ba2c228e868 100644 (file)
--- a/lib/Frontend/CMakeLists.txt
+++ b/lib/Frontend/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(LLVM_NO_RTTI 1)
 
-add_clang_library(clangDriver
+add_clang_library(clangFrontend
   HTMLDiagnostics.cpp
   InitHeaderSearch.cpp
   TextDiagnosticBuffer.cpp

diff --git a/tools/clang-cc/CMakeLists.txt b/tools/clang-cc/CMakeLists.txt
index 9dd596c2ce1ad65e04d44d9efc43c7458352061f..70e260a8561910f52be994113f29b35a1e90beef 100644 (file)
--- a/tools/clang-cc/CMakeLists.txt
+++ b/tools/clang-cc/CMakeLists.txt
@@ -5,7 +5,7 @@ set( LLVM_USED_LIBS
   clangAnalysis
   clangRewrite
   clangSema
-  clangDriver
+  clangFrontend
   clangAST
   clangParse
   clangLex

diff --git a/tools/driver/CMakeLists.txt b/tools/driver/CMakeLists.txt
index b2bc0bdb2f6453a5dd19efc0683d4c1704bb898f..fc7464afe052fb7160e5207e2ea04d7cb35936cb 100644 (file)
--- a/tools/driver/CMakeLists.txt
+++ b/tools/driver/CMakeLists.txt
@@ -1,3 +1,5 @@
+set(LLVM_NO_RTTI 1)
+
 set( LLVM_USED_LIBS
   clangDriver
   clangBasic
@@ -5,6 +7,6 @@ set( LLVM_USED_LIBS
 
 set(LLVM_LINK_COMPONENTS system support bitreader bitwriter)
 
-add_clang_tool(clang
+add_clang_executable(clang
   driver.cpp
   )