[llvm] r305088 - We do not need google test utils if we disabled LLVM_INCLUDE_TESTS

Vassil Vassilev via llvm-commits llvm-commits at lists.llvm.org
Fri Jun 9 09:37:39 PDT 2017


Author: vvassilev
Date: Fri Jun  9 11:37:39 2017
New Revision: 305088

URL: http://llvm.org/viewvc/llvm-project?rev=305088&view=rev
Log:
We do not need google test utils if we disabled LLVM_INCLUDE_TESTS

Fixes embedded uses of llvm where google testing framework is provided outside.

Modified:
    llvm/trunk/CMakeLists.txt

Modified: llvm/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/CMakeLists.txt?rev=305088&r1=305087&r2=305088&view=diff
==============================================================================
--- llvm/trunk/CMakeLists.txt (original)
+++ llvm/trunk/CMakeLists.txt Fri Jun  9 11:37:39 2017
@@ -853,7 +853,6 @@ if( LLVM_INCLUDE_UTILS )
   add_subdirectory(utils/not)
   add_subdirectory(utils/llvm-lit)
   add_subdirectory(utils/yaml-bench)
-  add_subdirectory(utils/unittest)
 else()
   if ( LLVM_INCLUDE_TESTS )
     message(FATAL_ERROR "Including tests when not building utils will not work.
@@ -897,6 +896,10 @@ if( LLVM_INCLUDE_TESTS )
   endif()
   add_subdirectory(test)
   add_subdirectory(unittests)
+  if( LLVM_INCLUDE_UTILS )
+    add_subdirectory(utils/unittest)
+  endif()
+
   if (WIN32)
     # This utility is used to prevent crashing tests from calling Dr. Watson on
     # Windows.




More information about the llvm-commits mailing list