Merge core

This commit is contained in:
Jesse Beder
2015-01-24 14:47:29 -06:00
2 changed files with 2 additions and 6 deletions

View File

@@ -9,11 +9,7 @@
namespace YAML { namespace YAML {
struct EmitterStyle { struct EmitterStyle {
enum value { enum value { Default, Block, Flow };
Default,
Block,
Flow,
};
}; };
} }

View File

@@ -31,4 +31,4 @@ set_target_properties(run-tests PROPERTIES
) )
target_link_libraries(run-tests yaml-cpp gtest gmock) target_link_libraries(run-tests yaml-cpp gtest gmock)
#add_test(yaml-reader-test run-tests) add_test(yaml-test ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/run-tests)