Skip to content

Fix CMAKE_IGNORE_PATH for Intel macs #6219

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
singiamtel wants to merge 1 commit into
base: master
Choose a base branch
from
+14 −1
Open

Fix CMAKE_IGNORE_PATH for Intel macs #6219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion abseil.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,19 @@ prepend_path:
---
#!/bin/bash -e

case $ARCHITECTURE in
osx*)
CMAKE_IGNORE_PATH="$(brew --prefix)/include"
;;
esac

mkdir -p $INSTALLROOT
cmake $SOURCEDIR \
-G Ninja \
${CXXSTD:+-DCMAKE_CXX_STANDARD=$CXXSTD} \
-DCMAKE_INSTALL_LIBDIR=lib \
-DBUILD_TESTING=OFF \
-DCMAKE_IGNORE_PATH="/opt/homebrew/include" \
${CMAKE_IGNORE_PATH:+-DCMAKE_IGNORE_PATH="$CMAKE_IGNORE_PATH"} \
-DCMAKE_INSTALL_PREFIX=$INSTALLROOT

cmake --build . -- ${JOBS:+-j$JOBS} install
Expand Down
7 changes: 7 additions & 0 deletions protobuf.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,20 @@ else
ALIBUILD_CMAKE_SOURCE_DIR=$SOURCEDIR
fi

case $ARCHITECTURE in
osx*)
CMAKE_IGNORE_PATH="$(brew --prefix)/include"
;;
esac

cmake -S "$ALIBUILD_CMAKE_SOURCE_DIR" \
-DCMAKE_INSTALL_PREFIX="$INSTALLROOT" \
-Dprotobuf_BUILD_TESTS=NO \
-Dprotobuf_MODULE_COMPATIBLE=YES \
-Dprotobuf_BUILD_SHARED_LIBS=OFF \
-Dprotobuf_ABSL_PROVIDER=package \
${ABSEIL_ROOT:+-Dabsl_DIR=$ABSEIL_ROOT} \
${CMAKE_IGNORE_PATH:+-DCMAKE_IGNORE_PATH="$CMAKE_IGNORE_PATH"} \
-DCMAKE_INSTALL_LIBDIR=lib

cmake --build . -- ${JOBS:+-j$JOBS} install
Expand Down
Loading