diff --git a/CMakePresets.json b/CMakePresets.json index a750981..b329cca 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -187,7 +187,7 @@ "name": "win-x64-msvc-static", "inherits": ["no-webview", "no-kde", "qt6"], "displayName": "Target x64-windows-static on Windows", - "description": "Build on Windows targeting x64-windows-static using MSVC, Qt 6 (for Qt libs and CMake/Ninja), vcpkg (for other dependencies) and MSYS2 (for Perl)", + "description": "Build on Windows targeting x64-windows-static using MSVC, Qt 6 (for Qt libs and CMake/Ninja), vcpkg (for other dependencies) and MSYS2 (for Perl, Go, ffmpeg and other tools)", "binaryDir": "$env{BUILD_DIR}/${sourceDirName}/win-x64-msvc-static", "environment": { "INCLUDE": "$env{MSVC_ROOT}/include;$env{MSVC_ROOT}/ATLMFC/include;$env{WIN_KITS_ROOT}/include/10.0.22000.0/ucrt;$env{WIN_KITS_ROOT}//include/10.0.22000.0//um;$env{WIN_KITS_ROOT}//include/10.0.22000.0//shared;$env{WIN_KITS_ROOT}/include/10.0.22000.0//winrt;$env{WIN_KITS_ROOT}/include/10.0.22000.0//cppwinrt", @@ -216,6 +216,7 @@ "PERL_BIN": {"type": "FILEPATH", "value": "$env{MSYS2_ROOT}/usr/bin/perl.exe"}, "DOXYGEN_BIN": {"type": "FILEPATH", "value": "$env{MSYS2_ROOT}/mingw64/bin/doxygen.exe"}, "CLANG_FORMAT_BIN": {"type": "FILEPATH", "value": "$env{MSYS2_ROOT}/mingw64/bin/clang-format.exe"}, + "GO_BIN": {"type": "FILEPATH", "value": "$env{MSYS2_ROOT}/mingw64/bin/go.exe"}, "FFMPEG_BIN": {"type": "FILEPATH", "value": "$env{MSYS2_ROOT}/mingw64/bin/ffmpeg.exe"}, "REALPATH_BIN": {"type": "FILEPATH", "value": "$env{MSYS2_ROOT}/usr/bin/realpath.exe"}, "FORCE_EXTERNAL_ICONV": {"type": "BOOL", "value": "ON"}, diff --git a/README.md b/README.md index 6f96496..b86bae8 100644 --- a/README.md +++ b/README.md @@ -190,17 +190,17 @@ installed. The `win-x64-msvc-static` preset (and all presets inheriting from it) need various additional environment variables to be set: -* `MSYS2_ROOT`: for Perl (only used by `qtforkawesome` so far), `clang-format`, Doxygen and FFmpeg provided - via MSYS2 packages; install the following packages: +* `MSYS2_ROOT`: for Perl (only used by `qtforkawesome` so far), `clang-format`, Doxygen, FFmpeg and Go (only + used by `libsyncthing`) provided via MSYS2 packages; install the following packages: ``` - pacman -Syu perl mingw-w64-x86_64-clang-tools-extra mingw-w64-x86_64-doxygen mingw-w64-x86_64-ffmpeg + pacman -Syu perl mingw-w64-x86_64-clang-tools-extra mingw-w64-x86_64-doxygen mingw-w64-x86_64-ffmpeg mingw-w64-x86_64-go ``` * `MSVC_ROOT`: for compiler and stdlib usually installed as part of Visual Studio setup, e.g. `C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Tools/MSVC/14.34.31933` * `WIN_KITS_ROOT`: for Windows platform headers/libraries usually installed as part of Visual Studio setup, e.g. `C:/Program Files (x86)/Windows Kits/10` -* `QT_ROOT`: for Qt libraries provided by official Qt installer, e.g. `D:/programming/qt/6.5.0/msvc2019_64` -* `QT_TOOLS`: for additional build tools provided by official Qt installer, e.g. `D:/programming/qt/Tools` +* `QT_ROOT`: for Qt libraries provided by the official Qt installer, e.g. `D:/programming/qt/6.5.0/msvc2019_64` +* `QT_TOOLS`: for additional build tools provided by the official Qt installer, e.g. `D:/programming/qt/Tools` * `VCPKG_ROOT`: directory of VCPKG checkout used for other dependencies; install the following packages: ``` vcpkg install boost-system:x64-windows-static boost-iostreams:x64-windows-static boost-filesystem:x64-windows-static boost-hana:x64-windows-static boost-process:x64-windows-static boost-asio:x64-windows-static libiconv:x64-windows-static zlib:x64-windows-static openssl:x64-windows-static cppunit:x64-windows-static