diff options
| author | 2022-07-22 14:49:43 -0400 | |
|---|---|---|
| committer | 2022-07-22 20:54:00 -0400 | |
| commit | 265d1d697935ec65e31d55fc424d96276d41a8c9 (patch) | |
| tree | 2bf3da2f89b9fa8e7b33bfd088920613a9982949 /.ci/scripts/linux/docker.sh | |
| parent | ci,CMake: Drop Conan support for vcpkg (diff) | |
| download | yuzu-265d1d697935ec65e31d55fc424d96276d41a8c9.tar.gz yuzu-265d1d697935ec65e31d55fc424d96276d41a8c9.tar.xz yuzu-265d1d697935ec65e31d55fc424d96276d41a8c9.zip | |
ci,CMake: Integrate vcpkg into CMakeLists
Uses manifest mode if the bundled vcpkg is used.
Diffstat (limited to '')
| -rwxr-xr-x | .ci/scripts/linux/docker.sh | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.ci/scripts/linux/docker.sh b/.ci/scripts/linux/docker.sh index d4787f684..436155b3d 100755 --- a/.ci/scripts/linux/docker.sh +++ b/.ci/scripts/linux/docker.sh | |||
| @@ -12,7 +12,6 @@ cmake .. \ | |||
| 12 | -DCMAKE_CXX_COMPILER=/usr/lib/ccache/g++ \ | 12 | -DCMAKE_CXX_COMPILER=/usr/lib/ccache/g++ \ |
| 13 | -DCMAKE_C_COMPILER=/usr/lib/ccache/gcc \ | 13 | -DCMAKE_C_COMPILER=/usr/lib/ccache/gcc \ |
| 14 | -DCMAKE_INSTALL_PREFIX="/usr" \ | 14 | -DCMAKE_INSTALL_PREFIX="/usr" \ |
| 15 | -DCMAKE_TOOLCHAIN_FILE=${VCPKG_TOOLCHAIN_FILE} \ | ||
| 16 | -DDISPLAY_VERSION=$1 \ | 15 | -DDISPLAY_VERSION=$1 \ |
| 17 | -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON \ | 16 | -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON \ |
| 18 | -DENABLE_QT_TRANSLATION=ON \ | 17 | -DENABLE_QT_TRANSLATION=ON \ |