From 448e6e84ca966757d263e55d40ae73bd48759f76 Mon Sep 17 00:00:00 2001 From: Guobang Bi <373318510@qq.com> Date: Sun, 8 Mar 2020 09:30:42 +0800 Subject: [PATCH] Revert "Revert "set default value for CMAKE_TOOLCHAIN_FILE"" This reverts commit d052121b7970361abb43c9ed430221a9ff34a10a. --- .github/workflows/build-qv2ray-cmake.yml | 2 +- CMakeLists.txt | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-qv2ray-cmake.yml b/.github/workflows/build-qv2ray-cmake.yml index 1a6de6b3..e57d6d2b 100644 --- a/.github/workflows/build-qv2ray-cmake.yml +++ b/.github/workflows/build-qv2ray-cmake.yml @@ -112,7 +112,7 @@ jobs: run: | mkdir build cd build - cmake .. -DCMAKE_TOOLCHAIN_FILE=../libs/${{ matrix.arch }}-windows/scripts/buildsystems/vcpkg.cmake -A ${{ matrix.buildarch }} + cmake .. -A ${{ matrix.buildarch }} cmake --build . --parallel $(nproc) # -------------------------------------------------------- - name: Linux - ${{ matrix.qt_version }} - Generate Dependencies and Build diff --git a/CMakeLists.txt b/CMakeLists.txt index 4683308e..fef64bf3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,6 +62,16 @@ if(APPLE) ) endif() +if(WIN32) + if(NOT CMAKE_TOOLCHAIN_FILE) + if(CMAKE_CL_64) + set(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/libs/x64-windows/scripts/buildsystems/vcpkg.cmake) + else() + set(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/libs/x86-windows/scripts/buildsystems/vcpkg.cmake) + endif() + endif() +endif() + if(DEFINED ENV{_QV2RAY_BUILD_INFO_}) set(_QV2RAY_BUILD_INFO_STR_ "$ENV{_QV2RAY_BUILD_INFO_}") else()