From 446737c9d30ff989919b0ba52134481fc7366e9b Mon Sep 17 00:00:00 2001 From: Dan Macumber Date: Tue, 26 Nov 2024 18:43:30 -0700 Subject: [PATCH] Update to OS 3.9.0 --- CMakeLists.txt | 2 +- FindOpenStudioSDK.cmake | 24 +++++++++++------------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3b78dc1e9..f7e15dbc4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,7 @@ if(CCACHE_PROGRAM) set(CMAKE_C_COMPILER_LAUNCHER ${CCACHE_PROGRAM} CACHE FILEPATH "C compiler cache used") endif() -project(OpenStudioApplication VERSION 1.8.0) +project(OpenStudioApplication VERSION 1.9.0) # Check system info globally so we can use it everywhere after: Has to be done before FindOpenStudioSDK.cmake if(APPLE) diff --git a/FindOpenStudioSDK.cmake b/FindOpenStudioSDK.cmake index 612e18001..4d3a1be12 100644 --- a/FindOpenStudioSDK.cmake +++ b/FindOpenStudioSDK.cmake @@ -1,12 +1,12 @@ set(OPENSTUDIO_VERSION_MAJOR 3) -set(OPENSTUDIO_VERSION_MINOR 8) +set(OPENSTUDIO_VERSION_MINOR 9) set(OPENSTUDIO_VERSION_PATCH 0) set(OPENSTUDIO_VERSION "${OPENSTUDIO_VERSION_MAJOR}.${OPENSTUDIO_VERSION_MINOR}.${OPENSTUDIO_VERSION_PATCH}") #If this is an official release, leave this "", otherwise put for eg '-rc1' set(OPENSTUDIO_VERSION_PRERELEASE "") # Enter SHA, always, eg "+79857912c4" -set(OPENSTUDIO_VERSION_SHA "+f953b6fcaf") +set(OPENSTUDIO_VERSION_SHA "+c77fbb9569") # Paths where the cmake-downloaded archives will be put set(OPENSTUDIO_ARCHIVE_DIR "${PROJECT_BINARY_DIR}/OpenStudio-${OPENSTUDIO_VERSION}") @@ -17,34 +17,32 @@ set(OPENSTUDIO_EXT "tar.gz") if(APPLE) set(OPENSTUDIO_PLATFORM "Darwin-${ARCH}") if(ARCH MATCHES "arm64") - set(OPENSTUDIO_EXPECTED_HASH 0e983b1a7bd2eed2b27c866125e0716b) + set(OPENSTUDIO_EXPECTED_HASH b373b0f23b529f9764464aae13725558) else() - set(OPENSTUDIO_EXPECTED_HASH 8be3effb0599888511958999774df569) + set(OPENSTUDIO_EXPECTED_HASH 39c5ae27eeb840472e36b728ab906315) endif() elseif(UNIX) set(OPENSTUDIO_PLATFORM "${LSB_RELEASE_ID_SHORT}-${LSB_RELEASE_VERSION_SHORT}-${ARCH}") if(LSB_RELEASE_VERSION_SHORT MATCHES "24.04") - set(OPENSTUDIO_PLATFORM "${LSB_RELEASE_ID_SHORT}-22.04-${ARCH}") + #set(OPENSTUDIO_PLATFORM "${LSB_RELEASE_ID_SHORT}-22.04-${ARCH}") if (ARCH MATCHES "arm64") - set(OPENSTUDIO_EXPECTED_HASH ff544a9dfa4846de6af959a0c1ec926d) + set(OPENSTUDIO_EXPECTED_HASH 4c35af3cc4e8d7b1aed2dd98b678a243) else() - set(OPENSTUDIO_EXPECTED_HASH b14c71b37a01040f3216abc68488ed62) + set(OPENSTUDIO_EXPECTED_HASH 256d18d2d7036883823f2aeae180dfaa) endif() elseif(LSB_RELEASE_VERSION_SHORT MATCHES "22.04") if (ARCH MATCHES "arm64") - set(OPENSTUDIO_EXPECTED_HASH ff544a9dfa4846de6af959a0c1ec926d) + set(OPENSTUDIO_EXPECTED_HASH fd1ba05628eb55b3bb72923a8395e267) else() - set(OPENSTUDIO_EXPECTED_HASH b14c71b37a01040f3216abc68488ed62) + set(OPENSTUDIO_EXPECTED_HASH 67522b9a1ba5749cf0b3cf101a6131cf) endif() - elseif(LSB_RELEASE_VERSION_SHORT MATCHES "20.04") - set(OPENSTUDIO_EXPECTED_HASH 98539ab193b15a140146add5e089900c) else() - message(FATAL_ERROR "OpenStudio SDK no longer provides packages for Ubuntu 18.04") + message(FATAL_ERROR "OpenStudio SDK no longer provides packages for Ubuntu 20.04 or older") endif() elseif(WIN32) - set(OPENSTUDIO_EXPECTED_HASH 26395d446a91a0042d3976cabd0fb5ab) + set(OPENSTUDIO_EXPECTED_HASH c3a1ec4bc98d7418780a702036ce0edb) set(OPENSTUDIO_PLATFORM "Windows") endif()