From 9ca680ae383d0a6426c8371d0e55957779058d68 Mon Sep 17 00:00:00 2001 From: tijcolem Date: Fri, 2 Feb 2024 15:40:15 -0700 Subject: [PATCH 1/2] updates for OpenStudio 3.7.0 and uo 0.11 --- CMakeLists.txt | 14 +++++++------- FindOpenStudioSDK.cmake | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4a2e3e68..bb3af474 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.10.2) cmake_policy(SET CMP0048 NEW) -project(URBANoptCLI VERSION 0.10.0) +project(URBANoptCLI VERSION 0.11.0) include(FindOpenStudioSDK.cmake) @@ -89,16 +89,16 @@ option(BUILD_PACKAGE "Build package" OFF) # need to update the MD5sum for each platform and url below if(UNIX) if(APPLE) - set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20230731-darwin.tar.gz") - set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "6dcaeb17c6567d5e5242c470b0ff2eb0") + set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20240202-darwin.tar.gz") + set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "27dad609451f5b0e7835efbcb8e362b7") else() - set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20230731-linux.tar.gz") - set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "ff67d59a162288cb7e5d4632e970e53d") + set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20240202-linux.tar.gz") + set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "2182c1ca7bcd85505db4700f4937d181") endif() elseif(WIN32) if(CMAKE_CL_64) - set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20230801-windows.tar.gz") - set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "2293f9f07643d110a84afaa0c1049c03") + set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20240202-windows.tar.gz") + set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "7a7cc4f928646363bd57b41e10caebca") endif() endif() diff --git a/FindOpenStudioSDK.cmake b/FindOpenStudioSDK.cmake index 6a82a4ef..93fe304c 100644 --- a/FindOpenStudioSDK.cmake +++ b/FindOpenStudioSDK.cmake @@ -1,6 +1,6 @@ set(OPENSTUDIO_VERSION_MAJOR 3) -set(OPENSTUDIO_VERSION_MINOR 6) -set(OPENSTUDIO_VERSION_PATCH 1) +set(OPENSTUDIO_VERSION_MINOR 7) +set(OPENSTUDIO_VERSION_PATCH 0) set(OPENSTUDIO_VERSION "${OPENSTUDIO_VERSION_MAJOR}.${OPENSTUDIO_VERSION_MINOR}.${OPENSTUDIO_VERSION_PATCH}") find_package(openstudio "${OPENSTUDIO_VERSION}" CONFIG) @@ -16,23 +16,23 @@ else() set(OPENSTUDIO_BASELINK "https://openstudio-builds.s3.amazonaws.com/${OPENSTUDIO_VERSION}" CACHE STRING "Base link to where the openstudio archives are hosted" FORCE) - set(OPENSTUDIO_VERSION_SHA "+bb9481519e") + set(OPENSTUDIO_VERSION_SHA "+d5269793f1") if(APPLE) - set(OPENSTUDIO_EXPECTED_HASH ba881908f683ec695c209399f261b299) + set(OPENSTUDIO_EXPECTED_HASH a4585ef0a3523168f8975ecd1cff1d12) set(OPENSTUDIO_PLATFORM "Darwin-x86_64") set(OPENSTUDIO_EXT "tar.gz") elseif(UNIX) if(LSB_RELEASE_VERSION_SHORT MATCHES "20.04") - set(OPENSTUDIO_EXPECTED_HASH 5e67958249d99f96149b4d5576c3d0ef) + set(OPENSTUDIO_EXPECTED_HASH 5c006e5e66e5e859206a63626ea2966f) set(OPENSTUDIO_PLATFORM "Ubuntu-20.04-x86_64") else() # Assumes 20.04 - set(OPENSTUDIO_EXPECTED_HASH 5e67958249d99f96149b4d5576c3d0ef) + set(OPENSTUDIO_EXPECTED_HASH 5c006e5e66e5e859206a63626ea2966f) set(OPENSTUDIO_PLATFORM "Ubuntu-20.04-x86_64") endif() set(OPENSTUDIO_EXT "tar.gz") elseif(WIN32) - set(OPENSTUDIO_EXPECTED_HASH 802f8cffeac24f011e636baf1e6ffd40) + set(OPENSTUDIO_EXPECTED_HASH f192860357fdbffb5705942a991b072b) set(OPENSTUDIO_PLATFORM "Windows") set(OPENSTUDIO_EXT "tar.gz") endif() From 22037932dbd9d3c975c744babd9fd77fb4d31c9d Mon Sep 17 00:00:00 2001 From: tijcolem Date: Fri, 2 Feb 2024 15:54:00 -0700 Subject: [PATCH 2/2] update cmake base link for openstudio --- FindOpenStudioSDK.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FindOpenStudioSDK.cmake b/FindOpenStudioSDK.cmake index 93fe304c..537e845f 100644 --- a/FindOpenStudioSDK.cmake +++ b/FindOpenStudioSDK.cmake @@ -13,7 +13,7 @@ else() # find_package(openstudio "${OPENSTUDIO_VERSION}" CONFIG REQUIRED) - set(OPENSTUDIO_BASELINK "https://openstudio-builds.s3.amazonaws.com/${OPENSTUDIO_VERSION}" + set(OPENSTUDIO_BASELINK "https://github.com/NREL/OpenStudio/releases/download/v${OPENSTUDIO_VERSION}" CACHE STRING "Base link to where the openstudio archives are hosted" FORCE) set(OPENSTUDIO_VERSION_SHA "+d5269793f1")