Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Temp rebuild 3.7.0 with E+ package on my fork that doesn't have dependency to libomp (m1) or libgcc_s_1 (x64) #5051

Merged
merged 2 commits into from
Dec 20, 2023
Merged

Temp rebuild 3.7.0 with E+ package on my fork that doesn't have dependency to libomp (m1) or libgcc_s_1 (x64) #5051

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20464af
Temp rebuild 3.7.0 with E+ package on my fork that doesn't have depen…
jmarrec Nov 22, 2023
bd2589d
Remove temp SHA override
jmarrec Dec 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,9 +198,9 @@ set(ENERGYPLUS_BUILD_SHA "7636e6b3e9")

# ENERGYPLUS_RELEASE_NAME is used to locate the E+ download
# from the github releases
set(ENERGYPLUS_RELEASE_NAME "v23.2.0")
set(ENERGYPLUS_RELEASE_NAME "v23.2.0-WithMacStaticLibs")

set(ENERGYPLUS_REPO "NREL")
set(ENERGYPLUS_REPO "jmarrec") # TODO: temp

# Radiance
set(RADIANCE_VERSION "5.0.a.12")
Expand Down Expand Up @@ -625,10 +625,10 @@ endif()
if(UNIX)
if(APPLE)
if (ARCH MATCHES "arm64")
set(ENERGYPLUS_EXPECTED_HASH 918a4544793aafc32df5910c83f05f1a)
set(ENERGYPLUS_EXPECTED_HASH 72948a3f884ce9fe44145210eceb8259)
set(ENERGYPLUS_PLATFORM "Darwin-macOS12.1-arm64")
else()
set(ENERGYPLUS_EXPECTED_HASH b8c1ee3fe45318a4575078de07cc5656)
set(ENERGYPLUS_EXPECTED_HASH 219c1a5cfec7b6fd6bd8507c043b82ab)
set(ENERGYPLUS_PLATFORM "Darwin-macOS10.15-x86_64")
endif()
elseif(LSB_RELEASE_ID_SHORT MATCHES "CentOS")
Expand Down