Skip to content

Commit 8823fac

Browse files
committed
Build - specify Qt5 for homebrew installation
We don't yet build on Qt6 which is now the default for homebrew.
1 parent b8fe6bf commit 8823fac

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

BUILD-MAC.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ few dependencies:
3939

4040
1. Xcode (12.1+) and command line tools
4141
2. Homebrew
42-
3. All other dependencies - Qt (5.15+), CMake (3.18+)
42+
3. All other dependencies - Qt5 (5.15+), CMake (3.18+)
4343

4444
### 1.1 Install Xcode
4545

@@ -68,7 +68,7 @@ Once you have Homebrew installed, pulling in the rest of the
6868
dependencies is a couple of lines to execute within a terminal:
6969

7070
```
71-
brew install qt cmake
71+
brew install qt@5 cmake
7272
7373
```
7474

app/gui/qt/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ if((${BUILD_32BIT}) AND (DEFINED ENV{QT_INSTALL_LOCATION32}))
2121
elseif(DEFINED ENV{QT_INSTALL_LOCATION})
2222
message(STATUS "Setting prefix to user-defined Qt install location: $ENV{QT_INSTALL_LOCATION}")
2323
set(CMAKE_PREFIX_PATH $ENV{QT_INSTALL_LOCATION})
24-
elseif(APPLE AND EXISTS /usr/local/opt/qt5)
24+
elseif(APPLE AND EXISTS /usr/local/opt/qt@5)
2525
# Homebrew installs Qt into/usr/local/qt5
26-
message(STATUS "Setting prefix to Homebrew's Qt install location: /usr/local/opt/qt5")
27-
set(CMAKE_PREFIX_PATH /usr/local/opt/qt5)
26+
message(STATUS "Setting prefix to Homebrew's Qt install location: /usr/local/opt/qt@5")
27+
set(CMAKE_PREFIX_PATH /usr/local/opt/qt@5)
2828
endif()
2929

3030
# Qt Setup
@@ -131,7 +131,7 @@ if (APPLE)
131131
)
132132
file(
133133
GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/run-macdeployqt.sh"
134-
CONTENT "PATH=$PATH:/usr/local/opt/qt5/bin macdeployqt \"$1\""
134+
CONTENT "PATH=$PATH:/usr/local/opt/qt@5/bin macdeployqt \"$1\""
135135
)
136136

137137
add_custom_command(

app/mac-prebuild.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ $RUBY "${SCRIPT_DIR}/server/ruby/bin/qt-doc.rb" -o "${SCRIPT_DIR}/gui/qt/utils/r
7777

7878
echo "Updating GUI translation files..."
7979
# Use lrelease on PATH if available otherwise assume Qt was installed via homebrew
80-
PATH=$PATH:/usr/local/opt/qt/bin lrelease "${SCRIPT_DIR}"/gui/qt/lang/*.ts
80+
PATH=$PATH:/usr/local/opt/qt@5/bin lrelease "${SCRIPT_DIR}"/gui/qt/lang/*.ts
8181

8282
echo "Compiling erlang files..."
8383
cd "${SCRIPT_DIR}/server/erlang/tau"

0 commit comments

Comments
 (0)