Skip to content
Open
Show file tree
Hide file tree
Changes from 13 commits
Commits
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
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions cmake/env/thisbdm.fish
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 4 additions & 0 deletions cmake/env/thisbdm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions cmake/external/ParaView.cmake

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please revert the change that hardcodes the tarball name in paraview.cmake? We should keep generating the tar file name dynamically.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hey @johnpapad24, please take care the points @sportokalidis mentioned to finalize this please, thanks

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

changes resolved yesterday please also accept the new pull requests for mac os 26

Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ SET(PARAVIEW_SOURCE_DIR "${CMAKE_THIRD_PARTY_DIR}/paraview")
if(APPLE AND "${DETECTED_ARCH}" STREQUAL "i386")
# The release of cmake 3.23.0 broke our build of ParaView on MacOSX.
# The build was fixed with a reupload and carries the additional tag cm233.
SET(PARAVIEW_TAR_FILE paraview_v5.10.0_cm323_${DETECTED_OS_VERS}_default.tar.gz)
SET(PARAVIEW_TAR_FILE paraview_v5.10.0_cm323_osx-15.7-i386_default.tar.gz)
elseif(APPLE AND "${DETECTED_ARCH}" STREQUAL "arm64")
SET(PARAVIEW_TAR_FILE paraview_v5.10.0_${DETECTED_OS_VERS}_default.tar.gz)
SET(PARAVIEW_TAR_FILE paraview_v5.10.0_osx-15.7-arm64_default.tar.gz)
else()
SET(PARAVIEW_TAR_FILE paraview_v5.9.0_${DETECTED_OS_VERS}_default.tar.gz)
endif()
Expand Down
3 changes: 2 additions & 1 deletion cmake/external/ROOT.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
24 changes: 24 additions & 0 deletions cmake/external/SHA256Digests.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,16 @@ 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-xcode-13.1-i386-ROOT be97dd72022c8d082fbe4394f18b55c4920f20b138cfff1b5fc2b41d397ac203)
SET(osx-xcode-13.1-arm64-ROOT 0a55b91c6df42d152b7943912e134f05c3872a73e73fcc129ee87fd847240ec8)
SET(osx-xcode-14.1-i386-ROOT 001311608512b24535bb9710b8baf006bd00e9b0595fd6bdf900d28b1e22c395)
Expand All @@ -108,6 +118,20 @@ 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(ubuntu-18.04-Libroadrunner bf9293c1c95d0b65227bd7e08c0048116ba851bcec5028ef72ea13762ef79276)
SET(ubuntu-18.04-ParaView e3fd74b13e9a4086988c5104c6b8d95c56365d25b491706a8e72018d0e5c76f1)
Expand Down
16 changes: 15 additions & 1 deletion demo/pyramidal_cell/visualize.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion util/installation/centos-7/prerequisites.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading