Merge from core

This commit is contained in:
Jesse Beder
2014-03-23 11:55:30 -05:00
3 changed files with 1009 additions and 1150 deletions
+1 -1
View File
@@ -2,7 +2,7 @@ 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 node/[a-z_]*.cpp)
file(GLOB test_sources [a-z_]*.cpp integration/[a-z_]*.cpp node/[a-z_]*.cpp)
file(GLOB test_new_api_sources new-api/[a-z]*.cpp)
list(APPEND test_sources ${test_new_api_sources})
+1 -1149
View File
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff