don't set VCPKG_DEFAULT_TRIPLET or VCPKG_TARGET_TRIPLET

Author: jordan-evens

.github/workflows/cmake-test.yml

@@ -64,7 +64,6 @@ jobs:
             compiler: g++
     env:
       CXX: ${{ matrix.compiler }}
-      VCPKG_DEFAULT_TRIPLET: ${{ matrix.target-cpu }}-${{ matrix.target-os }}-static
       VCPKG_DISABLE_METRICS: true
       VCPKG_ROOT: ${{ github.workspace }}/vcpkg
       VCPKG_DEFAULT_BINARY_CACHE: ${{ github.workspace }}/vcpkg/.cache

CMakeLists.txt

@@ -13,27 +13,26 @@ endif()
 if(NOT VCPKG_ROOT)
   set(VCPKG_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg")
 endif()
-# if (LINUX)
-#   set(VCPKG_CRT_LINKAGE static)
-#   set(VCPKG_LIBRARY_LINKAGE static)
-# else()
-#   set(VCPKG_CRT_LINKAGE dynamic)
-#   set(VCPKG_LIBRARY_LINKAGE dynamic)
+# if(NOT VCPKG_DEFAULT_TRIPLET)
+#   set(VCPKG_DEFAULT_TRIPLET $ENV{VCPKG_DEFAULT_TRIPLET})
+# endif()
+# if(NOT VCPKG_TARGET_TRIPLET)
+#   set(VCPKG_TARGET_TRIPLET $ENV{VCPKG_TARGET_TRIPLET})
 # endif()
+# if(NOT VCPKG_TARGET_TRIPLET)
+#   set(VCPKG_TARGET_TRIPLET ${VCPKG_DEFAULT_TRIPLET})
+# endif()
+message("VCPKG_DEFAULT_TRIPLET = ${VCPKG_DEFAULT_TRIPLET}")
+if (NOT APPLE)
+  set(VCPKG_CRT_LINKAGE static)
+  set(VCPKG_LIBRARY_LINKAGE static)
+endif()
 set(VCPKG_BUILD_TYPE release)
 set(CMAKE_TOOLCHAIN_FILE "${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
   CACHE STRING "Vcpkg toolchain file")
 
 if(WIN32)
   set(BUILD_SHARED_LIBS OFF)
-  # set(VCPKG_LIBRARY_LINKAGE static)
-  # FIX: unsure if this matters but doesn't break things on arm64
-  # set(VCPKG_TARGET_TRIPLET x64-windows-static)
-  # FIX: this should be equivalent to x64-windows-static - why does it work on arm64?
-  # message("CMAKE_SYSTEM_PROCESSOR = ${CMAKE_SYSTEM_PROCESSOR}")
-  # set(VCPKG_TARGET_ARCHITECTURE x64)
-  # set(VCPKG_CRT_LINKAGE static)
-  # set(VCPKG_LIBRARY_LINKAGE static)
   set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib")
 
 #   # Enable Hot Reload for MSVC compilers if supported.