Commit 6a3e6a86268bbf9a5e928423b739f40cf1501d95

Authored by Hayk Martirosyan
1 parent 139752e9

gtest working with make ci hopefully

Showing 2 changed files with 4 additions and 2 deletions
make-ci.sh
@@ -19,8 +19,9 @@ mkdir build @@ -19,8 +19,9 @@ mkdir build
19 cd build 19 cd build
20 cmake -DBUILD_GMOCK=OFF -DBUILD_GTEST=ON -DBUILD_SHARED_LIBS=ON .. 20 cmake -DBUILD_GMOCK=OFF -DBUILD_GTEST=ON -DBUILD_SHARED_LIBS=ON ..
21 time make 21 time make
22 -sudo mv googletest/libg* /usr/local/lib/  
23 cd ../.. 22 cd ../..
  23 +sudo cp googletest/build/googletest/libg* /usr/local/lib/
  24 +sudo cp -r googletest/googletest/include/gtest /usr/local/include
24 25
25 # Make redox 26 # Make redox
26 cmake -Dexamples=ON -Dlib=ON -Dstatic_lib=ON -Dtests=ON .. 27 cmake -Dexamples=ON -Dlib=ON -Dstatic_lib=ON -Dtests=ON ..
test/test.cpp
@@ -20,8 +20,9 @@ @@ -20,8 +20,9 @@
20 20
21 #include <iostream> 21 #include <iostream>
22 22
  23 +#include <gtest/gtest.h>
  24 +
23 #include "redox.hpp" 25 #include "redox.hpp"
24 -#include "gtest/gtest.h"  
25 26
26 namespace { 27 namespace {
27 28