Browse Source

fix(docs): Add brew prefix to macOS build instructions

Update brew's qt5 to qt@5, following brew naming deprecation.
pull/6447/head
Anthony Bilinski 4 years ago
parent
commit
3c682abc69
No known key found for this signature in database
GPG Key ID: 2AA8E0DA1B31FB3C
  1. 2
      .ci-scripts/build-osx.sh
  2. 2
      CMakeLists.txt
  3. 2
      INSTALL.md
  4. 2
      osx/Brewfile

2
.ci-scripts/build-osx.sh

@ -25,7 +25,7 @@ build_qtox() {
-DSPELL_CHECK=OFF \ -DSPELL_CHECK=OFF \
-DSTRICT_OPTIONS=ON \ -DSTRICT_OPTIONS=ON \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_PREFIX_PATH="$(brew --prefix qt5)" . -DCMAKE_PREFIX_PATH="$(brew --prefix qt@5)" .
make -j$(sysctl -n hw.ncpu) make -j$(sysctl -n hw.ncpu)
export CTEST_OUTPUT_ON_FAILURE=1 export CTEST_OUTPUT_ON_FAILURE=1
ctest -j$(sysctl -n hw.ncpu) ctest -j$(sysctl -n hw.ncpu)

2
CMakeLists.txt

@ -62,7 +62,7 @@ if(APPLE)
endif() endif()
execute_process( execute_process(
COMMAND brew --prefix qt5 COMMAND brew --prefix qt@5
OUTPUT_VARIABLE QT_PREFIX_PATH OUTPUT_VARIABLE QT_PREFIX_PATH
OUTPUT_STRIP_TRAILING_WHITESPACE) OUTPUT_STRIP_TRAILING_WHITESPACE)

2
INSTALL.md

@ -446,7 +446,7 @@ Finally, build qTox.
```bash ```bash
mkdir -p _build mkdir -p _build
cd _build cd _build
cmake .. cmake .. -DCMAKE_PREFIX_PATH=$(brew --prefix qt@5)
make -j$(sysctl -n hw.ncpu) make -j$(sysctl -n hw.ncpu)
make install make install
``` ```

2
osx/Brewfile

@ -11,7 +11,7 @@ brew "cmake"
brew "ffmpeg" brew "ffmpeg"
brew "libexif" brew "libexif"
brew "qrencode" brew "qrencode"
brew "qt5" brew "qt@5"
brew "sqlcipher" brew "sqlcipher"
brew "openal-soft" brew "openal-soft"
brew "msgpack" brew "msgpack"

Loading…
Cancel
Save