diff --git a/CMakeLists.txt b/CMakeLists.txt index b40aab9bee3fb..f3b1d55c2e6cd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,7 +46,7 @@ if(DEFINED ENV{CONDA_PREFIX}) endif() if(DEFINED ENV{INSTALL_PREFIX}) - message(STATUS "Install directory set to: $ENV{INSTALL_PREFIX}") + message(STATUS "Dependency install directory set to: $ENV{INSTALL_PREFIX}") list(APPEND CMAKE_PREFIX_PATH "$ENV{INSTALL_PREFIX}") endif() diff --git a/README.md b/README.md index f9db073609fdc..c8cf17029b0ef 100644 --- a/README.md +++ b/README.md @@ -87,16 +87,16 @@ dependencies for a given platform. The following setup scripts use the `DEPENDENCY_DIR` environment variable to set the location to download and build packages. This defaults to `deps-download` in the current working directory. Use `INSTALL_PREFIX` to set the install directory of the packages. -This defaults to `deps-install` in the current working directory on MacOS and to the +This defaults to `deps-install` in the current working directory on macOS and to the default install location on linux. -For MacOS, you will have to manually add the INSTALL_PREFIX value say +For macOS, you will have to manually add the INSTALL_PREFIX value say `export INSTALL_PREFIX=/Users/$USERNAME/velox/deps-install` to `~/.zshrc` so that subsequent builds can pick it up. ### Setting up on macOS -On a MacOS machine (either Intel or Apple silicon) you can setup and then build like so: +On a macOS machine (either Intel or Apple silicon) you can setup and then build like so: ```shell $ ./scripts/setup-macos.sh @@ -137,7 +137,7 @@ $ ./scripts/setup-adapters.sh $ make ``` -Note that `setup-adapters.sh` supports MacOS and Ubuntu 20.04 or later. +Note that `setup-adapters.sh` supports macOS and Ubuntu 20.04 or later. ### Using Clang on Linux diff --git a/scripts/setup-macos.sh b/scripts/setup-macos.sh index 1b42c587330e8..4afc90d07479e 100755 --- a/scripts/setup-macos.sh +++ b/scripts/setup-macos.sh @@ -32,6 +32,7 @@ SCRIPTDIR=$(dirname "${BASH_SOURCE[0]}") export INSTALL_PREFIX=${INSTALL_PREFIX:-"$(pwd)/deps-install"} source $SCRIPTDIR/setup-helper-functions.sh PYTHON_VENV=${PYHTON_VENV:-"${SCRIPTDIR}/../.venv"} +# Allow installed package headers to be picked up before brew package headers export OS_CXXFLAGS=" -isystem $(brew --prefix)/include" NPROC=$(getconf _NPROCESSORS_ONLN)