diff --git a/Set-up-Build-Environment-on-macOS.md b/Set-up-Build-Environment-on-macOS.md index af1faf6..f7534fd 100644 --- a/Set-up-Build-Environment-on-macOS.md +++ b/Set-up-Build-Environment-on-macOS.md @@ -18,30 +18,33 @@ brew install cmake asciidoctor To install the actual build dependencies, there are two options: 1. Via Homebrew (faster, but suitable only for local builds). -2. Via vcpkg (much slower, but suitable for distribution builds). +2. Via vcpkg (much slower, but suitable for distribution). #### Option 1: Install build dependencies via Homebrew Open a terminal and run: ``` -brew installqt@5 argon2 botan qrencode asciidoctor readline minizip +brew install qt@5 argon2 botan qrencode readline minizip ``` #### Option 2: Install build dependencies via vcpkg -Install vcpkg and pkg-config via Homebrew: +Set up vcpkg in a location of your choosing: ``` -brew install vcpkg pkg-config +git clone https://github.com/Microsoft/vcpkg.git +./vcpkg/bootstrap-vcpkg.sh ``` -Next, update the vcpkg port files: +Install pkg-config and (optionally) the vcpkg stub package via Homebrew: ``` -cd /opt/vcpkg && git pull +brew install pkg-config vcpkg ``` +If you installed the vcpkg stub package, set the ``VCPKG_ROOT` environment variable to your install location. You can then run the `vcpkg` from anywhere, given that Homebrew is in your `PATH`. Otherwise, call the `vcpkg` binary with its full path. + Finally, compile and install the actual build dependencies: ``` @@ -60,6 +63,5 @@ brew update && brew upgrade vcpkg: ``` -cd /opt/vcpkg && git pull -vcpkg update +cd vcpkg && git pull && ./vcpkg update ``` \ No newline at end of file