From 88890e84a21a2a6989638a688f2b851086e53a8b Mon Sep 17 00:00:00 2001 From: jcschaff Date: Sat, 25 May 2024 10:00:38 -0400 Subject: [PATCH] fix logic for macOS Intel in Stochastic solver CMakeLists.txt --- .github/workflows/cd.yml | 2 +- Stochastic/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 4639030c..8895a94c 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -89,7 +89,7 @@ jobs: brew info boost brew info hdf5 - - name: Build Macos AMD + - name: Build Macos ARM if: matrix.platform == 'macos-14' run: | platform=macos diff --git a/Stochastic/CMakeLists.txt b/Stochastic/CMakeLists.txt index fec04ffc..921e8829 100644 --- a/Stochastic/CMakeLists.txt +++ b/Stochastic/CMakeLists.txt @@ -35,7 +35,7 @@ endif() #include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../vcommons/include) #include_directories(${VCELL_MESSAGING_INCLUDE_DIR}) if (APPLE) - if (CMAKE_OS_ARCHITECTURES STREQUAL "x86_64") + if (CMAKE_OSX_ARCHITECTURES STREQUAL "x86_64") link_directories("/usr/local/Cellar/hdf5/1.14.3/lib") else () link_directories("/opt/homebrew/lib")