Skip to content

Commit

Permalink
update version of fmt and use prebuilt minizip
Browse files Browse the repository at this point in the history
  • Loading branch information
@macumber
macumber committed Jul 1, 2020
1 parent 484e84b commit 3e8a20a
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions ConanInstall.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
Expand Down

5 comments on commit 3e8a20a

@jmarrec
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@macumber Why? Was something not working before?

@macumber
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah I was having build issues with this at some point, we can close this

@jmarrec
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a comment on a commit to develop I just found through an unrelated git blame, I was just curious

@jmarrec
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Especially since I am not seeing a related cmake target_link_library change. Zlib and minizip may very well be unnecessary here anyways (i haven't checked). I believe they are needed for openstudio_ruby and for embedding stuff in the CLI (all done in SDK), not sure where else

@macumber
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh sorry, I saw that on my phone and thought it was a pull request. This was something I did when I was first trying to build OS app earlier in the summer. The conan recipes have been in such flux that this may no longer be relevant. I do believe this was a dependency coming in from OS SDK, we use the zip/unzip functionality in a few places in the OS SDK.

Please sign in to comment.