From 4d1338e2eebedef040c01e2c13390dff905d8f8c Mon Sep 17 00:00:00 2001
From: knewg <48651648+knewg@users.noreply.github.com>
Date: Mon, 27 Dec 2021 18:25:52 +0100
Subject: [PATCH 1/4] Update BUILD-INSTRUCTIONS-MACOS.md
Build instructions are not working for (at least) the new Silicon mac's. I don't have access to an older intel mac to see if the instructions are still working there, but since I couldn't find any open issues regarding this I assume it's only affecting silicon macs.
---
docs/BUILD-INSTRUCTIONS-MACOS.md | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/docs/BUILD-INSTRUCTIONS-MACOS.md b/docs/BUILD-INSTRUCTIONS-MACOS.md
index 5f0b440f..b163f952 100644
--- a/docs/BUILD-INSTRUCTIONS-MACOS.md
+++ b/docs/BUILD-INSTRUCTIONS-MACOS.md
@@ -3,18 +3,34 @@ gLabels MacOS Build Instructions
## Prerequisites
+For Intel Macs
```
brew install cmake
brew install qt
```
+For Apple Silcon Macs
+```
+brew install gcc
+brew install cmake
+brew install qt5
+```
+
+
+
## Compile and Install
cd glabels_source_directory
mkdir build
cd build
+
+# For Intel Macs
cmake -D CMAKE_PREFIX_PATH=/usr/local/opt/qt ..
+
+# For Apple Silcon Macs
+cmake -D CMAKE_PREFIX_PATH="/opt/homebrew/opt/qt5" -DCMAKE_C_COMPILER=/opt/homebrew/bin/gcc-11 -DCMAKE_CXX_COMPILER=/opt/homebrew/bin/g++-11 ..
+
make
sudo make install
From cdb6b9693d39c064ebed17fd2877b23af5cf3f64 Mon Sep 17 00:00:00 2001
From: knewg <48651648+knewg@users.noreply.github.com>
Date: Tue, 28 Dec 2021 07:20:38 +0100
Subject: [PATCH 2/4] Update BUILD-INSTRUCTIONS-MACOS.md
Fixing typos.
---
docs/BUILD-INSTRUCTIONS-MACOS.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/BUILD-INSTRUCTIONS-MACOS.md b/docs/BUILD-INSTRUCTIONS-MACOS.md
index b163f952..6316c0c2 100644
--- a/docs/BUILD-INSTRUCTIONS-MACOS.md
+++ b/docs/BUILD-INSTRUCTIONS-MACOS.md
@@ -9,7 +9,7 @@ brew install cmake
brew install qt
```
-For Apple Silcon Macs
+For Apple Silicon Macs
```
brew install gcc
brew install cmake
@@ -28,7 +28,7 @@ cd build
# For Intel Macs
cmake -D CMAKE_PREFIX_PATH=/usr/local/opt/qt ..
-# For Apple Silcon Macs
+# For Apple Silicon Macs
cmake -D CMAKE_PREFIX_PATH="/opt/homebrew/opt/qt5" -DCMAKE_C_COMPILER=/opt/homebrew/bin/gcc-11 -DCMAKE_CXX_COMPILER=/opt/homebrew/bin/g++-11 ..
make
From 928c7d3330ebda1effc4735d8e1b0ded96c8f94e Mon Sep 17 00:00:00 2001
From: knewg <48651648+knewg@users.noreply.github.com>
Date: Sun, 21 Aug 2022 07:43:28 +0200
Subject: [PATCH 3/4] Update docs/BUILD-INSTRUCTIONS-MACOS.md
Co-authored-by: Tommy Poll
---
docs/BUILD-INSTRUCTIONS-MACOS.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/BUILD-INSTRUCTIONS-MACOS.md b/docs/BUILD-INSTRUCTIONS-MACOS.md
index 6316c0c2..d04db93e 100644
--- a/docs/BUILD-INSTRUCTIONS-MACOS.md
+++ b/docs/BUILD-INSTRUCTIONS-MACOS.md
@@ -29,7 +29,7 @@ cd build
cmake -D CMAKE_PREFIX_PATH=/usr/local/opt/qt ..
# For Apple Silicon Macs
-cmake -D CMAKE_PREFIX_PATH="/opt/homebrew/opt/qt5" -DCMAKE_C_COMPILER=/opt/homebrew/bin/gcc-11 -DCMAKE_CXX_COMPILER=/opt/homebrew/bin/g++-11 ..
+cmake -D CMAKE_PREFIX_PATH="/opt/homebrew/opt/qt5" -DCMAKE_C_COMPILER=/opt/homebrew/bin/gcc-12 -DCMAKE_CXX_COMPILER=/opt/homebrew/bin/g++-12 ..
make
sudo make install
From 1c922e9c7b76541fe0e046441461933929b5ec18 Mon Sep 17 00:00:00 2001
From: knewg <48651648+knewg@users.noreply.github.com>
Date: Wed, 22 May 2024 07:24:20 +0200
Subject: [PATCH 4/4] Apply suggestions from code review
Commiting updates 2.5 years later.
Co-authored-by: Tommy Poll
---
docs/BUILD-INSTRUCTIONS-MACOS.md | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/docs/BUILD-INSTRUCTIONS-MACOS.md b/docs/BUILD-INSTRUCTIONS-MACOS.md
index d04db93e..f9b81ce4 100644
--- a/docs/BUILD-INSTRUCTIONS-MACOS.md
+++ b/docs/BUILD-INSTRUCTIONS-MACOS.md
@@ -6,14 +6,14 @@ gLabels MacOS Build Instructions
For Intel Macs
```
brew install cmake
-brew install qt
+brew install qt@5
```
For Apple Silicon Macs
```
-brew install gcc
+brew install gcc@14
brew install cmake
-brew install qt5
+brew install qt@5
```
@@ -26,10 +26,10 @@ mkdir build
cd build
# For Intel Macs
-cmake -D CMAKE_PREFIX_PATH=/usr/local/opt/qt ..
+cmake -D CMAKE_PREFIX_PATH=/usr/local/opt/qt@5 ..
# For Apple Silicon Macs
-cmake -D CMAKE_PREFIX_PATH="/opt/homebrew/opt/qt5" -DCMAKE_C_COMPILER=/opt/homebrew/bin/gcc-12 -DCMAKE_CXX_COMPILER=/opt/homebrew/bin/g++-12 ..
+cmake -D CMAKE_PREFIX_PATH="/opt/homebrew/opt/qt@5" -DCMAKE_C_COMPILER=/opt/homebrew/bin/gcc-14 -DCMAKE_CXX_COMPILER=/opt/homebrew/bin/g++-14 ..
make
sudo make install