diff --git a/cmake/modules/yaml-cpp.cmake b/cmake/modules/yaml-cpp.cmake index 79a46aa6..3d3d43e4 100644 --- a/cmake/modules/yaml-cpp.cmake +++ b/cmake/modules/yaml-cpp.cmake @@ -24,13 +24,18 @@ if(NOT USE_BUNDLED_DEPS) else() set(YAMLCPP_SRC "${PROJECT_BINARY_DIR}/yamlcpp-prefix/src/yamlcpp") message(STATUS "Using bundled yaml-cpp in '${YAMLCPP_SRC}'") - set(YAMLCPP_LIB "${YAMLCPP_SRC}/libyaml-cpp.a") + if(NOT WIN32) + set(YAMLCPP_LIB "${YAMLCPP_SRC}/libyaml-cpp.a") + else() + set(YAMLCPP_LIB "${YAMLCPP_SRC}/${CMAKE_BUILD_TYPE}/yaml-cpp.lib") + endif() set(YAMLCPP_INCLUDE_DIR "${YAMLCPP_SRC}/include") ExternalProject_Add( yamlcpp - URL "https://github.com/jbeder/yaml-cpp/archive/yaml-cpp-0.6.2.tar.gz" - URL_HASH "SHA256=e4d8560e163c3d875fd5d9e5542b5fd5bec810febdcba61481fe5fc4e6b1fd05" + URL "https://github.com/jbeder/yaml-cpp/archive/yaml-cpp-0.7.0.tar.gz" + URL_HASH "SHA256=43e6a9fcb146ad871515f0d0873947e5d497a1c9c60c58cb102a97b47208b7c3" BUILD_BYPRODUCTS ${YAMLCPP_LIB} + CMAKE_ARGS -DCMAKE_BUILD_TYPE=Release -DYAML_MSVC_SHARED_RT=Off -DYAML_BUILD_SHARED_LIBS=Off -DYAML_CPP_BUILD_TESTS=Off -DYAML_CPP_BUILD_TOOLS=OFF -DYAML_CPP_BUILD_CONTRIB=OFF -DCMAKE_DEBUG_POSTFIX='' BUILD_IN_SOURCE 1 INSTALL_COMMAND "") endif()