Merge core

2015-01-24 14:47:29 -06:00 · 2015-01-24 14:47:29 -06:00 · c324bf8a7d
commit c324bf8a7d
parent 391111c055 2b2e607118
2 changed files with 2 additions and 6 deletions
--- a/include/yaml-cpp/emitterstyle.h
+++ b/include/yaml-cpp/emitterstyle.h
@ -9,11 +9,7 @@

 namespace YAML {
 struct EmitterStyle {
-  enum value {
-    Default,
-    Block,
-    Flow,
-  };
+  enum value { Default, Block, Flow };
 };
 }

--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@ -31,4 +31,4 @@ set_target_properties(run-tests PROPERTIES
 )
 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)