Skip to content
Snippets Groups Projects
Unverified Commit ac590da8 authored by Alexander Turenko's avatar Alexander Turenko
Browse files

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

parents eb845c45 f29466cd
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
cmake/BuildLibYAML.cmake
+ 1
− 1
View file @ ac590da8
...@@ -4,7 +4,7 @@ macro(libyaml_build) ...@@ -4,7 +4,7 @@ macro(libyaml_build)
set(LIBYAML_INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/third_party/libyaml/include) set(LIBYAML_INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/third_party/libyaml/include)
set(LIBYAML_LIBRARIES yaml) 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 # See comments in BuildLibEV.cmake
set_target_properties(yaml PROPERTIES COMPILE_FLAGS "-w") set_target_properties(yaml PROPERTIES COMPILE_FLAGS "-w")
......
test-run @ 97f81e4c
Compare 95562e95...97f81e4c
Subproject commit 95562e95401fef4e0b755ab0bb430974b5d1a29a Subproject commit 97f81e4c99c9d2a28026a4d6ee9d57cebd3f5fe0
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment