From 3e8a20ade81e4995bb6d3c157320a9c35031c8f2 Mon Sep 17 00:00:00 2001 From: Dan Macumber Date: Tue, 30 Jun 2020 21:52:36 -0600 Subject: [PATCH] update version of fmt and use prebuilt minizip --- ConanInstall.cmake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ConanInstall.cmake b/ConanInstall.cmake index c2e250bb3..468d9af81 100644 --- a/ConanInstall.cmake +++ b/ConanInstall.cmake @@ -37,7 +37,7 @@ if(NOT CONAN_OPENSTUDIO_ALREADY_RUN) # Convenience variable to set a consistent version for individual boost packages # set(BOOST_VERSION "1.71.0") - list(APPEND CONAN_OPTIONS "zlib:minizip=True") + #list(APPEND CONAN_OPTIONS "zlib:minizip=True") # You do want to rebuild packages if there's a newer recipe in the remote (which applies mostly to our own openstudio_ruby where we don't # bump the actual package version when we make changes) than the binaries were built with # 'outdated' also acts like 'missing': if no binary, will build them. @@ -62,7 +62,8 @@ if(NOT CONAN_OPENSTUDIO_ALREADY_RUN) pugixml/1.10@bincrafters/stable jsoncpp/1.9.2 zlib/1.2.11 - fmt/6.0.0 + minizip/1.2.11 + fmt/6.2.0 sqlite3/3.30.1 cpprestsdk/2.10.14@bincrafters/stable websocketpp/0.8.1@bincrafters/stable