Merge ostream_wrapper fix from core

This commit is contained in:
Jesse Beder
2014-03-22 19:27:54 -05:00
4 changed files with 74 additions and 6 deletions

View File

@@ -1,8 +1,8 @@
add_subdirectory(gtest-1.7.0)
include_directories(gtest-1.7.0/include)
file(GLOB test_headers [a-z]*.h)
file(GLOB test_sources [a-z]*.cpp)
file(GLOB test_headers [a-z_]*.h)
file(GLOB test_sources [a-z_]*.cpp)
file(GLOB test_new_api_sources new-api/[a-z]*.cpp)
list(APPEND test_sources ${test_new_api_sources})