Skip to content

Commit fd99583

Browse files
committed
Use my release which includes the missing mac x86_64 + arm ubuntus
1 parent 991ffc2 commit fd99583

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

CMakeLists.txt

+12-12
Original file line numberDiff line numberDiff line change
@@ -196,13 +196,13 @@ set(ENERGYPLUS_VERSION_MINOR 1)
196196
set(ENERGYPLUS_VERSION_PATCH 0)
197197
set(ENERGYPLUS_VERSION "${ENERGYPLUS_VERSION_MAJOR}.${ENERGYPLUS_VERSION_MINOR}.${ENERGYPLUS_VERSION_PATCH}")
198198
# Build SHA is not required to have a value, but if it does OpenStudio will require this build.
199-
set(ENERGYPLUS_BUILD_SHA "46864d6807")
199+
set(ENERGYPLUS_BUILD_SHA "ab8eee336c")
200200

201201
# ENERGYPLUS_RELEASE_NAME is used to locate the E+ download
202202
# from the github releases
203-
set(ENERGYPLUS_RELEASE_NAME "v25.1.0-IOFreeze")
203+
set(ENERGYPLUS_RELEASE_NAME "v25.1.0-IOFreeze-Ubuntu-arm64-macfixup")
204204

205-
set(ENERGYPLUS_REPO "NREL")
205+
set(ENERGYPLUS_REPO "jmarrec")
206206

207207
# Radiance
208208
set(RADIANCE_VERSION "5.0.a.12")
@@ -639,27 +639,27 @@ endif()
639639
if(UNIX)
640640
if(APPLE)
641641
if (ARCH MATCHES "arm64")
642-
set(ENERGYPLUS_EXPECTED_HASH 8a7336112955e90c525cf78fd33ce927)
642+
set(ENERGYPLUS_EXPECTED_HASH 93a61321dd225a296289fb4370f6ae83)
643643
set(ENERGYPLUS_PLATFORM "Darwin-macOS13-arm64")
644644
else()
645-
set(ENERGYPLUS_EXPECTED_HASH 21bdad40fbc560b4b382469ef9f96936)
645+
set(ENERGYPLUS_EXPECTED_HASH 3abc2f8379405a3d48c08bca92b3b610)
646646
set(ENERGYPLUS_PLATFORM "Darwin-macOS12.1-x86_64")
647647
endif()
648648
elseif(LSB_RELEASE_ID_SHORT MATCHES "CentOS")
649-
set(ENERGYPLUS_EXPECTED_HASH 4000e06b944daf4f2b0841ac0d3873b5)
649+
set(ENERGYPLUS_EXPECTED_HASH TODO_TDB_TODO)
650650
set(ENERGYPLUS_PLATFORM "Linux-CentOS7.9.2009-x86_64")
651651
else()
652652
if(LSB_RELEASE_VERSION_SHORT MATCHES "24.04")
653653
if (ARCH MATCHES "arm64")
654-
set(ENERGYPLUS_EXPECTED_HASH afc61e89b7f9e2658c3d99778be50be0)
654+
set(ENERGYPLUS_EXPECTED_HASH 3a5232f304a1370c460c9b083988dc97)
655655
else()
656-
set(ENERGYPLUS_EXPECTED_HASH aa57a2f74c476e56cdf93f7f60c855ba)
656+
set(ENERGYPLUS_EXPECTED_HASH abade7e9c11ea9da9dfe976459b8ea5a)
657657
endif()
658658
elseif(LSB_RELEASE_VERSION_SHORT MATCHES "22.04")
659659
if (ARCH MATCHES "arm64")
660-
set(ENERGYPLUS_EXPECTED_HASH 3c18cb8063ec30ef591109ddf8842bf0)
660+
set(ENERGYPLUS_EXPECTED_HASH 6ed5ec3639255edac220635f1581c81b)
661661
else()
662-
set(ENERGYPLUS_EXPECTED_HASH 2710ff0d929fd1f3d7208de71f54a279)
662+
set(ENERGYPLUS_EXPECTED_HASH 15c0bf1a745af0269c2c41d416f05b03)
663663
endif()
664664
else() # e.g., 18.04, 20.04
665665
message(FATAL_ERROR "EnergyPlus no longer provides packages for Ubuntu < 22.04")
@@ -696,11 +696,11 @@ elseif(WIN32)
696696
if(CMAKE_SIZEOF_VOID_P EQUAL 8) # 64 bit
697697
set(ENERGYPLUS_PATH "EnergyPlus-${ENERGYPLUS_VERSION}-${ENERGYPLUS_BUILD_SHA}-Windows-x86_64")
698698
set(ENERGYPLUS_ARCH 64)
699-
set(ENERGYPLUS_EXPECTED_HASH b68d91d8e2a3aa83fc581e89bd8e03b7)
699+
set(ENERGYPLUS_EXPECTED_HASH 6ec4d3140a26d29bc9fe5b3f6791623f)
700700
else()
701701
set(ENERGYPLUS_PATH "EnergyPlus-${ENERGYPLUS_VERSION}-${ENERGYPLUS_BUILD_SHA}-Windows-i386")
702702
set(ENERGYPLUS_ARCH 32)
703-
set(ENERGYPLUS_EXPECTED_HASH 7f0c2901399f43bff6e23c01a5992df1)
703+
set(ENERGYPLUS_EXPECTED_HASH TODO_TDB_TODO)
704704
endif()
705705
if(EXISTS "${PROJECT_BINARY_DIR}/${ENERGYPLUS_PATH}.zip")
706706
file(MD5 "${PROJECT_BINARY_DIR}/${ENERGYPLUS_PATH}.zip" ENERGYPLUS_HASH)

0 commit comments

Comments
 (0)