Skip to content

Commit eb7ad12

Browse files
committed
don't set triplet
1 parent 1d3d50b commit eb7ad12

File tree

2 files changed

+0
-13
lines changed

2 files changed

+0
-13
lines changed

.github/workflows/cmake-test.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ jobs:
6464
compiler: g++
6565
env:
6666
CXX: ${{ matrix.compiler }}
67-
VCPKG_TARGET_TRIPLET: ${{ matrix.target-cpu }}-${{ matrix.target-os }}-static
6867
VCPKG_DISABLE_METRICS: true
6968
VCPKG_ROOT: ${{ github.workspace }}/vcpkg
7069
VCPKG_DEFAULT_BINARY_CACHE: ${{ github.workspace }}/vcpkg/.cache

CMakeLists.txt

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,6 @@ endif()
1313
if(NOT VCPKG_ROOT)
1414
set(VCPKG_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg")
1515
endif()
16-
# if(NOT VCPKG_DEFAULT_TRIPLET)
17-
# set(VCPKG_DEFAULT_TRIPLET $ENV{VCPKG_DEFAULT_TRIPLET})
18-
# endif()
19-
message("VCPKG_TARGET_TRIPLET = ${VCPKG_TARGET_TRIPLET}")
20-
if(NOT VCPKG_TARGET_TRIPLET)
21-
set(VCPKG_TARGET_TRIPLET $ENV{VCPKG_TARGET_TRIPLET})
22-
endif()
23-
message("VCPKG_TARGET_TRIPLET = ${VCPKG_TARGET_TRIPLET}")
24-
# if(NOT VCPKG_TARGET_TRIPLET)
25-
# set(VCPKG_TARGET_TRIPLET ${VCPKG_DEFAULT_TRIPLET})
26-
# endif()
27-
message("VCPKG_DEFAULT_TRIPLET = ${VCPKG_DEFAULT_TRIPLET}")
2816
if (NOT APPLE)
2917
set(VCPKG_CRT_LINKAGE static)
3018
set(VCPKG_LIBRARY_LINKAGE static)

0 commit comments

Comments
 (0)