From 79eb9aaebbd8443afae82ee4173c788ac1382d31 Mon Sep 17 00:00:00 2001 From: XXX Date: Tue, 4 May 2021 22:10:54 -0600 Subject: [PATCH 1/2] Update to OS 3.2.0 --- FindOpenStudioSDK.cmake | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/FindOpenStudioSDK.cmake b/FindOpenStudioSDK.cmake index 99845de6e..5761adea8 100644 --- a/FindOpenStudioSDK.cmake +++ b/FindOpenStudioSDK.cmake @@ -6,29 +6,29 @@ set(OPENSTUDIO_VERSION "${OPENSTUDIO_VERSION_MAJOR}.${OPENSTUDIO_VERSION_MINOR}. #If this is a release enter the SHA as "+79857912c4" #set(OPENSTUDIO_VERSION_SHA "+09b7c8a554") #If this is a pre-release enter the pre-release and SHA as "-rc1+79857912c4" -set(OPENSTUDIO_VERSION_SHA "-rc1+2249bb4700") +set(OPENSTUDIO_VERSION_SHA "+e11f0a08b2") # Paths where the cmake-downloaded archives will be put set(OPENSTUDIO_ARCHIVE_DIR "${PROJECT_BINARY_DIR}/OpenStudio-${OPENSTUDIO_VERSION}") # If downloaded, we need the SHA to match. This block is here since we need "OPENSTUDIO_PLATFORM" anyways if(APPLE) - set(OPENSTUDIO_EXPECTED_HASH 6b553cc839852f94f0c77c2fd222007a) + set(OPENSTUDIO_EXPECTED_HASH 883c0f83ab7a09875e851726e32ba591) set(OPENSTUDIO_PLATFORM "Darwin") set(OPENSTUDIO_EXT "tar.gz") elseif(UNIX) if(LSB_RELEASE_VERSION_SHORT MATCHES "20.04") - set(OPENSTUDIO_EXPECTED_HASH 0bca38a37f74e733ac49a2577abac9cf) + set(OPENSTUDIO_EXPECTED_HASH 25c4cfe614676376581657440ba447ae) set(OPENSTUDIO_PLATFORM "Ubuntu-20.04") else() # Assumes 18.04 - set(OPENSTUDIO_EXPECTED_HASH 9161ae070c597affa88a38b9c2f5e82f) + set(OPENSTUDIO_EXPECTED_HASH 623d3e10c17f1dc99bb869deb8a2550e) set(OPENSTUDIO_PLATFORM "Ubuntu-18.04") endif() set(OPENSTUDIO_EXT "tar.gz") elseif(WIN32) - set(OPENSTUDIO_EXPECTED_HASH fbb37b1e83beb41abbe002bcf3d19f68) + set(OPENSTUDIO_EXPECTED_HASH 740d5d8ba67ca914412e12c618d2cc28) set(OPENSTUDIO_PLATFORM "Windows") set(OPENSTUDIO_EXT "tar.gz") endif() @@ -53,11 +53,10 @@ if(openstudio_FOUND) else() # Not found: no problem, we download it - # base link for release builds set(OPENSTUDIO_BASELINK_RELEASE #"https://openstudio-builds.s3.amazonaws.com/${OPENSTUDIO_VERSION}" - https://github.com/NREL/OpenStudio/releases/download/v3.2.0-rc1/ + https://github.com/NREL/OpenStudio/releases/download/v3.2.0/ CACHE STRING "Base link to where the openstudio archives are hosted" FORCE) # base link for develop builds. (Using https will fail) From a1155ea4533daedc23e2a43704c062efc936ca79 Mon Sep 17 00:00:00 2001 From: XXX Date: Tue, 4 May 2021 22:14:15 -0600 Subject: [PATCH 2/2] Update nrel conan registry --- ConanInstall.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ConanInstall.cmake b/ConanInstall.cmake index feba26ea0..cc5c06102 100644 --- a/ConanInstall.cmake +++ b/ConanInstall.cmake @@ -29,7 +29,7 @@ if(NOT CONAN_OPENSTUDIO_ALREADY_RUN) # Add NREL remote and place it first in line, since we vendored dependencies to NREL's repo, they will be picked first conan_add_remote(NAME nrel INDEX 0 - URL https://api.bintray.com/conan/commercialbuilding/nrel) + URL https://conan.commercialbuildings.dev/artifactory/api/conan/openstudio) conan_add_remote(NAME bincrafters URL https://api.bintray.com/conan/bincrafters/public-conan)