github/Qv2ray
5
0
Fork 0
mirror of https://github.com/Qv2ray/Qv2ray.git synced 2025-05-20 10:50:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Revert "set default value for CMAKE_TOOLCHAIN_FILE""

Browse Source 
This reverts commit d052121b79.
This commit is contained in:
Guobang Bi 2020-03-08 09:30:42 +08:00
parent d052121b79
commit 448e6e84ca
No known key found for this signature in database
GPG Key ID: D850BE43BE29325B
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build-qv2ray-cmake.yml vendored
View File

@ -112,7 +112,7 @@ jobs:
run: | run: |
mkdir build mkdir build
cd 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) cmake --build . --parallel $(nproc)
# -------------------------------------------------------- # --------------------------------------------------------
- name: Linux - ${{ matrix.qt_version }} - Generate Dependencies and Build - name: Linux - ${{ matrix.qt_version }} - Generate Dependencies and Build

10
CMakeLists.txt
View File

@ -62,6 +62,16 @@ if(APPLE)
) )
endif() 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_}) if(DEFINED ENV{_QV2RAY_BUILD_INFO_})
set(_QV2RAY_BUILD_INFO_STR_ "$ENV{_QV2RAY_BUILD_INFO_}") set(_QV2RAY_BUILD_INFO_STR_ "$ENV{_QV2RAY_BUILD_INFO_}")
else() else()