diff --git a/.github/workflows/macos-ci.yml b/.github/workflows/macos-ci.yml index 51c72e37b..816364e24 100644 --- a/.github/workflows/macos-ci.yml +++ b/.github/workflows/macos-ci.yml @@ -14,7 +14,7 @@ jobs: build: strategy: matrix: - os: [macos-14, macos-15] + os: [macos-14, macos-15, macos-26] runs-on: ${{ matrix.os }} diff --git a/.github/workflows/macos-system-ci.yml b/.github/workflows/macos-system-ci.yml index 7f22afd88..615670f15 100644 --- a/.github/workflows/macos-system-ci.yml +++ b/.github/workflows/macos-system-ci.yml @@ -21,7 +21,7 @@ jobs: build: strategy: matrix: - os: [macos-14, macos-15] + os: [macos-14, macos-15, macos-26] runs-on: ${{ matrix.os }} diff --git a/CMakeLists.txt b/CMakeLists.txt index 3657f21c9..dbacc0a9b 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -359,6 +359,7 @@ if(paraview) set(Qt5_DIR ${BREW_PREFIX}/opt/qt@5/lib/cmake/Qt5) set(QT_CMAKE_DIR ${BREW_PREFIX}/opt/qt@5/lib/cmake/Qt5) set(DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH} ${BREW_PREFIX}/opt/qt@5/lib) + set(ParaView_DIR ${CMAKE_THIRD_PARTY_DIR}/paraview) else() set(Qt5_DIR ${CMAKE_THIRD_PARTY_DIR}/qt/lib/cmake/Qt5) endif(APPLE) diff --git a/cmake/env/thisbdm.fish b/cmake/env/thisbdm.fish index 875851f88..9402cff6e 100755 --- a/cmake/env/thisbdm.fish +++ b/cmake/env/thisbdm.fish @@ -170,6 +170,7 @@ function source_thisbdm set -l bdm_pv_version '5.9' if test (uname) = 'Darwin' set -l bdm_pv_version '5.9' + set -gx PATH "$BDMSYS/third_party/paraview/bin:$PATH" end # Clear the env from previously set ParaView and Qt paths. diff --git a/cmake/env/thisbdm.sh b/cmake/env/thisbdm.sh index 262165bc2..bf60a90fa 100755 --- a/cmake/env/thisbdm.sh +++ b/cmake/env/thisbdm.sh @@ -253,6 +253,7 @@ _source_thisbdm() local bdm_pv_version='5.9' if [ "$(uname)" = 'Darwin' ]; then bdm_pv_version='5.10' + export PATH=${BDMSYS}/third_party/paraview/bin:$PATH fi # Clear the env from previously set ParaView and Qt paths. @@ -499,6 +500,9 @@ _source_thisbdm() if [ "$BDM_CUSTOM_QT" = false ] || [ -z "${Qt5_DIR}" ]; then # On Apple devices we use the brew install of Qt5 if [ "$(uname)" = 'Darwin' ];then + if [ "$(arch)" = 'arm64' ]; then + export PATH=/opt/homebrew/bin:$PATH + fi Qt5_DIR=$(brew --prefix)/opt/qt@5 else Qt5_DIR=${BDMSYS}/third_party/qt diff --git a/cmake/external/ROOT.cmake b/cmake/external/ROOT.cmake index 9d62ac9b9..c23024d3f 100644 --- a/cmake/external/ROOT.cmake +++ b/cmake/external/ROOT.cmake @@ -6,7 +6,8 @@ SET(ROOT_SOURCE_DIR "${CMAKE_THIRD_PARTY_DIR}/root") set(ROOT_TAR_FILE root_v6.30.02_cxx17_python3.9_${DETECTED_OS_VERS}.tar.gz) set(ROOT_SHA_KEY ${DETECTED_OS_VERS}-ROOT) if(APPLE) - if("${DETECTED_OS_VERS}" MATCHES "^osx-15" OR + if("${DETECTED_OS_VERS}" MATCHES "^osx-26" OR + "${DETECTED_OS_VERS}" MATCHES "^osx-15" OR "${DETECTED_OS_VERS}" MATCHES "^osx-14" OR "${DETECTED_OS_VERS}" MATCHES "^osx-13" OR "${DETECTED_OS_VERS}" MATCHES "^osx-12" OR diff --git a/cmake/external/SHA256Digests.cmake b/cmake/external/SHA256Digests.cmake index e82005e35..6c66af1e9 100644 --- a/cmake/external/SHA256Digests.cmake +++ b/cmake/external/SHA256Digests.cmake @@ -84,6 +84,20 @@ SET(osx-15.6-i386-ParaView d2e89df30ab0e2729b28539de37753e09c061b4c434b0a68e8055 SET(osx-15.6-arm64-ParaView 5e89b785ac0c56bbca31e2ae101a8986953e90227fe42a1ef7adcc70a0ff6fc4) SET(osx-15.7-i386-ParaView d2e89df30ab0e2729b28539de37753e09c061b4c434b0a68e80554f7fa617ccb) SET(osx-15.7-arm64-ParaView 5e89b785ac0c56bbca31e2ae101a8986953e90227fe42a1ef7adcc70a0ff6fc4) +SET(osx-26.0-i386-ParaView d2e89df30ab0e2729b28539de37753e09c061b4c434b0a68e80554f7fa617ccb) +SET(osx-26.0-arm64-ParaView 5e89b785ac0c56bbca31e2ae101a8986953e90227fe42a1ef7adcc70a0ff6fc4) +SET(osx-26.1-i386-ParaView d2e89df30ab0e2729b28539de37753e09c061b4c434b0a68e80554f7fa617ccb) +SET(osx-26.1-arm64-ParaView 5e89b785ac0c56bbca31e2ae101a8986953e90227fe42a1ef7adcc70a0ff6fc4) +SET(osx-26.2-i386-ParaView d2e89df30ab0e2729b28539de37753e09c061b4c434b0a68e80554f7fa617ccb) +SET(osx-26.2-arm64-ParaView 5e89b785ac0c56bbca31e2ae101a8986953e90227fe42a1ef7adcc70a0ff6fc4) +SET(osx-26.3-i386-ParaView d2e89df30ab0e2729b28539de37753e09c061b4c434b0a68e80554f7fa617ccb) +SET(osx-26.3-arm64-ParaView 5e89b785ac0c56bbca31e2ae101a8986953e90227fe42a1ef7adcc70a0ff6fc4) +SET(osx-26.4-i386-ParaView d2e89df30ab0e2729b28539de37753e09c061b4c434b0a68e80554f7fa617ccb) +SET(osx-26.4-arm64-ParaView 5e89b785ac0c56bbca31e2ae101a8986953e90227fe42a1ef7adcc70a0ff6fc4) +SET(osx-26.5-i386-ParaView d2e89df30ab0e2729b28539de37753e09c061b4c434b0a68e80554f7fa617ccb) +SET(osx-26.5-arm64-ParaView 5e89b785ac0c56bbca31e2ae101a8986953e90227fe42a1ef7adcc70a0ff6fc4) + + SET(osx-xcode-13.1-i386-ROOT be97dd72022c8d082fbe4394f18b55c4920f20b138cfff1b5fc2b41d397ac203) SET(osx-xcode-13.1-arm64-ROOT 0a55b91c6df42d152b7943912e134f05c3872a73e73fcc129ee87fd847240ec8) SET(osx-xcode-14.1-i386-ROOT 001311608512b24535bb9710b8baf006bd00e9b0595fd6bdf900d28b1e22c395) @@ -108,6 +122,24 @@ SET(osx-xcode-16.3-i386-ROOT b0be8291d14c0c66f250297e524debc1d6888a95da32e80918f SET(osx-xcode-16.3-arm64-ROOT b525e0d360eb6c1912ab1cfcbf7fe30bfa8d55c48b80bcae65b62bf403ca0d9c) SET(osx-xcode-16.4-i386-ROOT 7de1ad1d658363ca13687dddd7164f039d58fb549a4befe4a622a8e60eede62f) SET(osx-xcode-16.4-arm64-ROOT 88810d081e0237e2fe436dc937e783bdf3f1c5d86ed7b3ff766d969dfe6bd0b3) +SET(osx-xcode-26.0-i386-ROOT 7de1ad1d658363ca13687dddd7164f039d58fb549a4befe4a622a8e60eede62f) +SET(osx-xcode-26.0-arm64-ROOT 81774a6499697bd57dc18eeb7c2537c08b5c308103f43fb0db7064a11b26f0cc) +SET(osx-xcode-26.0.1-i386-ROOT 7de1ad1d658363ca13687dddd7164f039d58fb549a4befe4a622a8e60eede62f) +SET(osx-xcode-26.0.1-arm64-ROOT 81774a6499697bd57dc18eeb7c2537c08b5c308103f43fb0db7064a11b26f0cc) +SET(osx-xcode-26.1-i386-ROOT 7de1ad1d658363ca13687dddd7164f039d58fb549a4befe4a622a8e60eede62f) +SET(osx-xcode-26.1-arm64-ROOT 81774a6499697bd57dc18eeb7c2537c08b5c308103f43fb0db7064a11b26f0cc) +SET(osx-xcode-26.1.1-i386-ROOT 7de1ad1d658363ca13687dddd7164f039d58fb549a4befe4a622a8e60eede62f) +SET(osx-xcode-26.1.1-arm64-ROOT 81774a6499697bd57dc18eeb7c2537c08b5c308103f43fb0db7064a11b26f0cc) +SET(osx-xcode-26.2-i386-ROOT 7de1ad1d658363ca13687dddd7164f039d58fb549a4befe4a622a8e60eede62f) +SET(osx-xcode-26.2-arm64-ROOT 81774a6499697bd57dc18eeb7c2537c08b5c308103f43fb0db7064a11b26f0cc) +SET(osx-xcode-26.3-i386-ROOT 7de1ad1d658363ca13687dddd7164f039d58fb549a4befe4a622a8e60eede62f) +SET(osx-xcode-26.3-arm64-ROOT 81774a6499697bd57dc18eeb7c2537c08b5c308103f43fb0db7064a11b26f0cc) +SET(osx-xcode-26.4-i386-ROOT 7de1ad1d658363ca13687dddd7164f039d58fb549a4befe4a622a8e60eede62f) +SET(osx-xcode-26.4-arm64-ROOT 81774a6499697bd57dc18eeb7c2537c08b5c308103f43fb0db7064a11b26f0cc) +SET(osx-xcode-26.5-i386-ROOT 7de1ad1d658363ca13687dddd7164f039d58fb549a4befe4a622a8e60eede62f) +SET(osx-xcode-26.5-arm64-ROOT 81774a6499697bd57dc18eeb7c2537c08b5c308103f43fb0db7064a11b26f0cc) + + SET(ubuntu-18.04-Libroadrunner bf9293c1c95d0b65227bd7e08c0048116ba851bcec5028ef72ea13762ef79276) SET(ubuntu-18.04-ParaView e3fd74b13e9a4086988c5104c6b8d95c56365d25b491706a8e72018d0e5c76f1) diff --git a/demo/pyramidal_cell/visualize.sh b/demo/pyramidal_cell/visualize.sh index 2f88ec22b..019f8dc54 100755 --- a/demo/pyramidal_cell/visualize.sh +++ b/demo/pyramidal_cell/visualize.sh @@ -1,7 +1,21 @@ #!/bin/bash +get_script_dir() { + local SOURCE="${BASH_SOURCE[0]}" + # Resolve symlinks + while [ -L "$SOURCE" ]; do + local DIR + DIR="$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )" + SOURCE="$(readlink "$SOURCE")" + # If symlink was relative, resolve relative to symlink base dir + [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" + done + # Get final absolute directory + cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd +} + # Determine the directory of this script -BDM_SCRIPT_DIR=$(readlink -e $(dirname "${BASH_SOURCE[0]}")) +BDM_SCRIPT_DIR=$(get_script_dir) cd $BDM_SCRIPT_DIR # Build and run the simulation diff --git a/util/installation/centos-7/prerequisites.sh b/util/installation/centos-7/prerequisites.sh index 6ade0b5f1..7890a6fec 100755 --- a/util/installation/centos-7/prerequisites.sh +++ b/util/installation/centos-7/prerequisites.sh @@ -45,7 +45,7 @@ sudo yum install -y \ curl -L -O https://github.com/Kitware/CMake/releases/download/v3.19.3/cmake-3.19.3-Linux-x86_64.sh chmod +x cmake-3.19.3-Linux-x86_64.sh -./cmake-3.19.3-Linux-x86_64.sh --skip-license --prefix=/usr/local +sudo ./cmake-3.19.3-Linux-x86_64.sh --skip-license --prefix=/usr/local if [ -n "${PYENV_ROOT}" ]; then unset PYENV_ROOT