Merge remote-tracking branch 'origin/1.10' into 2.0

tarantool · Aug 2, 2018 · 29df7d3 · 29df7d3
2 parents 4cc0c2c + ac590da
commit 29df7d3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cmake/BuildLibYAML.cmake b/cmake/BuildLibYAML.cmake
@@ -4,7 +4,7 @@ macro(libyaml_build)
     set(LIBYAML_INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/third_party/libyaml/include)
     set(LIBYAML_LIBRARIES yaml)
 
-    add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/libyaml)
+    add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/libyaml EXCLUDE_FROM_ALL)
     # See comments in BuildLibEV.cmake
     set_target_properties(yaml PROPERTIES COMPILE_FLAGS "-w")
 

diff --git a/test-run b/test-run