Skip to content

Commit

Permalink
Merge pull request #511 from bunty95/macOS-Catalina
Browse files Browse the repository at this point in the history
macOS Catalina
  • Loading branch information
hannesa2 authored Jul 30, 2024
2 parents 7024a1a + dfab2ef commit 75a1f86
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,8 @@ Various solutions exist for cmake configuration to be informed about
non-standard installation paths for required components. See CMake
documentation for details. (hint: QTDIR)

For MacOS, you can install Qt with Homebrew:
brew install qt
For macOS, you can install Qt with Homebrew:
brew install qt@5

Then give the Qt directory to CMake and build:
#### x86:
Expand All @@ -116,7 +116,7 @@ Then give the Qt directory to CMake and build:
The application is built in "bin/DLT Viewer.app", it can be launched from Finder or the command line:
open -a $DLT_BUILD_DIR/bin/DLT\ Viewer.app

## Building DLT Viewer release version with Qmake on MacOs
## Building DLT Viewer release version with Qmake on macOS

Sometimes building with Cmake or in Qt Creator leads to Plugins not working in DLT Viewer.
Building with qmake in release version gets rid of this problem.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Developed with QT5 and Qt6 (http://qt-project.org/)
Tested with Windows 11 + Qt 5.15.2 + Microsoft Visual Studio Build Tools 2019
Tested with Windows 11 + Qt 6.7.1 + Microsoft Visual Studio Build Tools 2019
Tested with Ubuntu Linux 18.04 + Qt 5.9.5
Tested with macOS Sierra + Qt 5.7.0
Tested with macOS Catalina + Qt 5.15.13
Dynamically linked open source software

Qt 5.x.x (LGPLv3 - Qt)
Expand Down
2 changes: 1 addition & 1 deletion scripts/darwin/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ echo Build with CMake
cmake -G Ninja \
-DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} \
-DCMAKE_PREFIX_PATH=${Qt5_DIR}/lib/cmake \
-DCMAKE_OSX_DEPLOYMENT_TARGET=12.7 \
-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 \
-DCMAKE_BUILD_TYPE=Release \
-DDLT_USE_QT_RPATH=ON \
-DDLT_PARSER=OFF \
Expand Down

0 comments on commit 75a1f86

Please sign in to comment.