From 6a3e6a86268bbf9a5e928423b739f40cf1501d95 Mon Sep 17 00:00:00 2001 From: Hayk Martirosyan Date: Mon, 13 Jun 2016 23:43:12 -0700 Subject: [PATCH] gtest working with make ci hopefully --- make-ci.sh | 3 ++- test/test.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/make-ci.sh b/make-ci.sh index 90fe6e5..d553ef9 100755 --- a/make-ci.sh +++ b/make-ci.sh @@ -19,8 +19,9 @@ mkdir build cd build cmake -DBUILD_GMOCK=OFF -DBUILD_GTEST=ON -DBUILD_SHARED_LIBS=ON .. time make -sudo mv googletest/libg* /usr/local/lib/ cd ../.. +sudo cp googletest/build/googletest/libg* /usr/local/lib/ +sudo cp -r googletest/googletest/include/gtest /usr/local/include # Make redox cmake -Dexamples=ON -Dlib=ON -Dstatic_lib=ON -Dtests=ON .. diff --git a/test/test.cpp b/test/test.cpp index cbafca5..f18eb73 100644 --- a/test/test.cpp +++ b/test/test.cpp @@ -20,8 +20,9 @@ #include +#include + #include "redox.hpp" -#include "gtest/gtest.h" namespace { -- libgit2 0.21.4