From 4ff1811dd6ba89a96e535058266ec349fd360771 Mon Sep 17 00:00:00 2001 From: Luke Street Date: Sat, 13 Jun 2020 20:12:51 -0400 Subject: [PATCH] Create separate VS configurations for vcpkg --- CMakeSettings.json | 91 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 71 insertions(+), 20 deletions(-) diff --git a/CMakeSettings.json b/CMakeSettings.json index 88d90c49a..56cbf38af 100644 --- a/CMakeSettings.json +++ b/CMakeSettings.json @@ -11,16 +11,6 @@ "buildCommandArgs": "-v", "ctestCommandArgs": "", "variables": [ - { - "name": "CMAKE_TOOLCHAIN_FILE", - "value": "C:\\vcpkg\\scripts\\buildsystems\\vcpkg.cmake", - "type": "FILEPATH" - }, - { - "name": "VCPKG_TARGET_TRIPLET", - "value": "x64-windows-static", - "type": "STRING" - }, { "name": "CMAKE_MSVC_RUNTIME_LIBRARY", "value": "MultiThreadedDebug", @@ -63,6 +53,49 @@ "cmakeCommandArgs": "", "buildCommandArgs": "-v", "ctestCommandArgs": "", + "variables": [ + { + "name": "CMAKE_MSVC_RUNTIME_LIBRARY", + "value": "MultiThreaded", + "type": "STRING" + }, + { + "name": "CMAKE_C_COMPILER", + "value": "C:\\Program Files\\LLVM\\bin\\clang-cl.exe", + "type": "FILEPATH" + }, + { + "name": "CMAKE_CXX_COMPILER", + "value": "C:\\Program Files\\LLVM\\bin\\clang-cl.exe", + "type": "FILEPATH" + }, + { + "name": "CMAKE_LINKER", + "value": "C:\\Program Files\\LLVM\\bin\\lld-link.exe", + "type": "FILEPATH" + }, + { + "name": "CMAKE_AR", + "value": "C:\\Program Files\\LLVM\\bin\\llvm-ar.exe", + "type": "FILEPATH" + }, + { + "name": "CMAKE_RANLIB", + "value": "C:\\Program Files\\LLVM\\bin\\llvm-ranlib.exe", + "type": "FILEPATH" + } + ] + }, + { + "name": "x64-Clang-Release-vcpkg", + "generator": "Ninja", + "configurationType": "RelWithDebInfo", + "inheritEnvironments": [ "clang_cl_x64" ], + "buildRoot": "${projectDir}\\out\\build\\${name}", + "installRoot": "${projectDir}\\out\\install\\${name}", + "cmakeCommandArgs": "", + "buildCommandArgs": "-v", + "ctestCommandArgs": "", "variables": [ { "name": "CMAKE_TOOLCHAIN_FILE", @@ -117,16 +150,6 @@ "ctestCommandArgs": "", "inheritEnvironments": [ "msvc_x64_x64" ], "variables": [ - { - "name": "CMAKE_TOOLCHAIN_FILE", - "value": "C:\\vcpkg\\scripts\\buildsystems\\vcpkg.cmake", - "type": "FILEPATH" - }, - { - "name": "VCPKG_TARGET_TRIPLET", - "value": "x64-windows-static", - "type": "STRING" - }, { "name": "CMAKE_MSVC_RUNTIME_LIBRARY", "value": "MultiThreadedDebug", @@ -154,6 +177,34 @@ "buildCommandArgs": "-v", "ctestCommandArgs": "", "inheritEnvironments": [ "msvc_x64_x64" ], + "variables": [ + { + "name": "CMAKE_MSVC_RUNTIME_LIBRARY", + "value": "MultiThreaded", + "type": "STRING" + }, + { + "name": "CMAKE_CXX_FLAGS", + "value": "", + "type": "STRING" + }, + { + "name": "CMAKE_C_FLAGS", + "value": "", + "type": "STRING" + } + ] + }, + { + "name": "x64-MSVC-Release-vcpkg", + "generator": "Ninja", + "configurationType": "RelWithDebInfo", + "buildRoot": "${projectDir}\\out\\build\\${name}", + "installRoot": "${projectDir}\\out\\install\\${name}", + "cmakeCommandArgs": "", + "buildCommandArgs": "-v", + "ctestCommandArgs": "", + "inheritEnvironments": [ "msvc_x64_x64" ], "variables": [ { "name": "CMAKE_TOOLCHAIN_FILE",