[cfe-commits] r158910 - in /cfe/trunk/unittests: Basic/CMakeLists.txt CMakeLists.txt Frontend/CMakeLists.txt Lex/CMakeLists.txt Tooling/CMakeLists.txt

Chandler Carruth chandlerc at gmail.com
Thu Jun 21 02:51:42 PDT 2012


Author: chandlerc
Date: Thu Jun 21 04:51:42 2012
New Revision: 158910

URL: http://llvm.org/viewvc/llvm-project?rev=158910&view=rev
Log:
Clang side of a refactoring of the CMake unit test build strategy.

The fundamental change is to put a CMakeLists.txt file in the unittest
directory, with a single test binary produced from it. This has several
advantages.

Among other fundamental advantages, we start to get the checking logic
for when a file is missing from the CMake build, and this caught one
missing file already! More fun details in the LLVM commit corresponding
to this one.

Note that the LLVM commit and this one most both be applied, or neither.
Sorry for any skew issues.

Added:
    cfe/trunk/unittests/Basic/CMakeLists.txt
    cfe/trunk/unittests/Frontend/CMakeLists.txt
    cfe/trunk/unittests/Lex/CMakeLists.txt
    cfe/trunk/unittests/Tooling/CMakeLists.txt
Modified:
    cfe/trunk/unittests/CMakeLists.txt

Added: cfe/trunk/unittests/Basic/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Basic/CMakeLists.txt?rev=158910&view=auto
==============================================================================
--- cfe/trunk/unittests/Basic/CMakeLists.txt (added)
+++ cfe/trunk/unittests/Basic/CMakeLists.txt Thu Jun 21 04:51:42 2012
@@ -0,0 +1,9 @@
+add_clang_unittest(BasicTests
+  FileManagerTest.cpp
+  SourceManagerTest.cpp
+  )
+
+target_link_libraries(BasicTests
+  clangBasic
+  clangLex
+  )

Modified: cfe/trunk/unittests/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/CMakeLists.txt?rev=158910&r1=158909&r2=158910&view=diff
==============================================================================
--- cfe/trunk/unittests/CMakeLists.txt (original)
+++ cfe/trunk/unittests/CMakeLists.txt Thu Jun 21 04:51:42 2012
@@ -9,37 +9,7 @@
   add_unittest(ClangUnitTests ${test_dirname} ${ARGN})
 endfunction()
 
-add_clang_unittest(BasicTests
-  Basic/FileManagerTest.cpp
-  Basic/SourceManagerTest.cpp
-  )
-target_link_libraries(BasicTests
-  clangLex
-  )
-
-add_clang_unittest(LexTests
-  Lex/LexerTest.cpp
-  )
-target_link_libraries(LexTests
-  clangLex
-  )
-
-add_clang_unittest(FrontendTests
-  Frontend/FrontendActionTest.cpp
-  )
-target_link_libraries(FrontendTests
-  clangFrontend
-  )
-
-add_clang_unittest(ToolingTests
-  Tooling/CompilationDatabaseTest.cpp
-  Tooling/ToolingTest.cpp
-  Tooling/RecursiveASTVisitorTest.cpp
-  Tooling/RefactoringTest.cpp
-  Tooling/RewriterTest.cpp
-  )
-target_link_libraries(ToolingTests
-  clangAST
-  clangTooling
-  clangRewrite
-  )
+add_subdirectory(Basic)
+add_subdirectory(Lex)
+add_subdirectory(Frontend)
+add_subdirectory(Tooling)

Added: cfe/trunk/unittests/Frontend/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Frontend/CMakeLists.txt?rev=158910&view=auto
==============================================================================
--- cfe/trunk/unittests/Frontend/CMakeLists.txt (added)
+++ cfe/trunk/unittests/Frontend/CMakeLists.txt Thu Jun 21 04:51:42 2012
@@ -0,0 +1,6 @@
+add_clang_unittest(FrontendTests
+  FrontendActionTest.cpp
+  )
+target_link_libraries(FrontendTests
+  clangFrontend
+  )

Added: cfe/trunk/unittests/Lex/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Lex/CMakeLists.txt?rev=158910&view=auto
==============================================================================
--- cfe/trunk/unittests/Lex/CMakeLists.txt (added)
+++ cfe/trunk/unittests/Lex/CMakeLists.txt Thu Jun 21 04:51:42 2012
@@ -0,0 +1,8 @@
+add_clang_unittest(LexTests
+  LexerTest.cpp
+  PreprocessingRecordTest.cpp
+  )
+
+target_link_libraries(LexTests
+  clangLex
+  )

Added: cfe/trunk/unittests/Tooling/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Tooling/CMakeLists.txt?rev=158910&view=auto
==============================================================================
--- cfe/trunk/unittests/Tooling/CMakeLists.txt (added)
+++ cfe/trunk/unittests/Tooling/CMakeLists.txt Thu Jun 21 04:51:42 2012
@@ -0,0 +1,13 @@
+add_clang_unittest(ToolingTests
+  CompilationDatabaseTest.cpp
+  ToolingTest.cpp
+  RecursiveASTVisitorTest.cpp
+  RefactoringTest.cpp
+  RewriterTest.cpp
+  )
+
+target_link_libraries(ToolingTests
+  clangAST
+  clangTooling
+  clangRewrite
+  )





More information about the cfe-commits mailing list