From 18e2dcf37e6e2c0517e5585d6225c93ea580caae Mon Sep 17 00:00:00 2001 From: admercs Date: Thu, 7 Mar 2024 09:59:42 -0800 Subject: [PATCH] update macos --- scripts/build_ros2_macos.sh | 4 ++-- scripts/setup.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/build_ros2_macos.sh b/scripts/build_ros2_macos.sh index c4ea955e..d9699a41 100644 --- a/scripts/build_ros2_macos.sh +++ b/scripts/build_ros2_macos.sh @@ -59,14 +59,14 @@ echo "XCode Command Line Tools path: $(sudo xcode-select -p)" # Install Homebrew dependencies. echo 'Installing Homebrew dependencies...' -yes | brew install asio assimp bison bullet cmake console_bridge cppcheck \ +brew install asio assimp bison bullet cmake console_bridge cppcheck \ cunit eigen freetype graphviz opencv openssl orocos-kdl pcre poco \ pyqt5 python qt@5 sip spdlog osrf/simulation/tinyxml1 tinyxml2 # Install a specific clang version. echo "Installing LLVM/Clang version: ${CLANG_VERSION}" brew tap homebrew/versions -yes | brew install "llvm${CLANG_VERSION}" +brew install "llvm@${CLANG_VERSION}" # Add OPENSSL_ROOT_DIR for DDS-Security. echo "export OPENSSL_ROOT_DIR=$(brew --prefix openssl)" | tee -a "${HOME}/.bashrc" diff --git a/scripts/setup.sh b/scripts/setup.sh index 8bd27b45..aa6ecdf4 100644 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -96,7 +96,7 @@ done # Ensure LLVM and Vulkan are installed. if [ "$(uname)" = 'Darwin' ]; then - brew install "llvm${CLANG_VERSION}" + brew install "llvm@${CLANG_VERSION}" else sudo add-apt-repository -y ppa:graphics-drivers/ppa sudo apt-get update -y