Merge pull request #2 from flanfly/master

fix gtest includes
das-labor · Oct 28, 2017 · d318b5b · d318b5b
2 parents 513e672 + c21ebc6
commit d318b5b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 3.8 FATAL_ERROR)
 project(NeoPG VERSION 0.1 LANGUAGES C CXX)
 
 # Google Test
-set(GTEST_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/googletest)
+set(GTEST_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/googletest/googletest/)
 set(GTEST_INCLUDE_DIR ${GTEST_ROOT}/include)
 if(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows")
   set(gtest_force_shared_crt ON CACHE BOOL

diff --git a/include/neopg/utils/stream.h b/include/neopg/utils/stream.h
@@ -9,7 +9,7 @@
 #include <neopg/common.h>
 #include <iostream>
 #include <streambuf>
-#include "gtest/gtest_prod.h"
+#include <gtest/gtest_prod.h>
 
 namespace NeoPG {