Merge pull request #186 from openstudiocoalition/master

Master

CMakeLists.txt

@@ -10,7 +10,7 @@ if(CCACHE_PROGRAM)
   set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
 endif()
 
-project(OpenStudioApplication VERSION 1.0.0)
+project(OpenStudioApplication VERSION 1.0.1)
 
 # set openstudio_DIR to the directory that contains the openstudioConfig.cmake
 # eg C:\src\OpenStudio\build-vs\_CPack_Packages\win64\ZIP\OpenStudio-3.0.0-rc2+ce27ae6b85-Windows\lib\cmake\openstudio

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