[polly] r291638 - Teach Polly's standalone build to work now that we include the gmock

Chandler Carruth via llvm-commits llvm-commits at lists.llvm.org
Tue Jan 10 17:07:37 PST 2017


Author: chandlerc
Date: Tue Jan 10 19:07:37 2017
New Revision: 291638

URL: http://llvm.org/viewvc/llvm-project?rev=291638&view=rev
Log:
Teach Polly's standalone build to work now that we include the gmock
component of gtest.

Modified:
    polly/trunk/CMakeLists.txt

Modified: polly/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/CMakeLists.txt?rev=291638&r1=291637&r2=291638&view=diff
==============================================================================
--- polly/trunk/CMakeLists.txt (original)
+++ polly/trunk/CMakeLists.txt Tue Jan 10 19:07:37 2017
@@ -86,8 +86,19 @@ if (NOT DEFINED LLVM_MAIN_SRC_DIR)
   # Enable unit tests if available.
   set(UNITTEST_DIR ${LLVM_SOURCE_ROOT}/utils/unittest)
   if(EXISTS ${UNITTEST_DIR}/googletest/include/gtest/gtest.h)
-    add_library(gtest ${UNITTEST_DIR}/googletest/src/gtest-all.cc)
-    target_include_directories(gtest PUBLIC "${UNITTEST_DIR}/googletest/include" PRIVATE "${UNITTEST_DIR}/googletest")
+    add_library(gtest
+      ${UNITTEST_DIR}/googletest/src/gtest-all.cc
+      ${UNITTEST_DIR}/googlemock/src/gmock-all.cc
+    )
+    target_include_directories(gtest
+      PUBLIC
+      "${UNITTEST_DIR}/googletest/include"
+      "${UNITTEST_DIR}/googlemock/include"
+
+      PRIVATE
+      "${UNITTEST_DIR}/googletest"
+      "${UNITTEST_DIR}/googlemock"
+    )
     target_link_libraries(gtest ${LLVM_SYSTEM_LIBS})
 
     add_library(gtest_main ${UNITTEST_DIR}/UnitTestMain/TestMain.cpp)




More information about the llvm-commits mailing list