From 0988d957f581229d3805dbb1727d875ed0b9d9b8 Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Mon, 21 Feb 2022 19:09:59 -0500 Subject: [PATCH] Update preset configurations to include release and debug versions of MSVC and Clang only. --- cmake/CMakeSettings.json | 60 ++++------------------------------------ 1 file changed, 6 insertions(+), 54 deletions(-) diff --git a/cmake/CMakeSettings.json b/cmake/CMakeSettings.json index 9320341ec4..d8ef47a220 100644 --- a/cmake/CMakeSettings.json +++ b/cmake/CMakeSettings.json @@ -82,7 +82,7 @@ "configurationType": "Debug", "buildRoot": "${workspaceRoot}\\build\\${name}", "installRoot": "${workspaceRoot}\\install\\${name}", - "cmakeCommandArgs": "-C ${workspaceRoot}\\cmake\\presets\\windows.cmake", + "cmakeCommandArgs": "-C ${workspaceRoot}\\cmake\\presets\\windows.cmake -DCMAKE_C_COMPILER=clang-cl.exe -DCMAKE_CXX_COMPILER=clang-cl.exe", "buildCommandArgs": "", "ctestCommandArgs": "", "inheritEnvironments": [ "clang_cl_x64" ], @@ -115,15 +115,15 @@ ] }, { - "name": "x64-Debug-OneAPI", + "name": "x64-Release-Clang", "generator": "Ninja", - "configurationType": "Debug", + "configurationType": "Release", "buildRoot": "${workspaceRoot}\\build\\${name}", "installRoot": "${workspaceRoot}\\install\\${name}", - "cmakeCommandArgs": "-C ${workspaceRoot}\\cmake\\presets\\windows.cmake -DCMAKE_CXX_COMPILER=icx -DCMAKE_C_COMPILER=icx", + "cmakeCommandArgs": "-C ${workspaceRoot}\\cmake\\presets\\windows.cmake -DCMAKE_C_COMPILER=clang-cl.exe -DCMAKE_CXX_COMPILER=clang-cl.exe", "buildCommandArgs": "", "ctestCommandArgs": "", - "inheritEnvironments": [ "msvc_x64_x64" ], + "inheritEnvironments": [ "clang_cl_x64" ], "variables": [ { "name": "BUILD_SHARED_LIBS", @@ -149,56 +149,8 @@ "name": "ENABLE_TESTING", "value": "True", "type": "BOOL" - }, - { - "name": "BUILD_MPI", - "value": "False", - "type": "BOOL" - } - ] - }, - { - "name": "x64-Debug-Intel", - "generator": "Ninja", - "configurationType": "Debug", - "buildRoot": "${workspaceRoot}\\build\\${name}", - "installRoot": "${workspaceRoot}\\install\\${name}", - "cmakeCommandArgs": "-C ${workspaceRoot}\\cmake\\presets\\windows.cmake -DCMAKE_CXX_COMPILER=icl -DCMAKE_C_COMPILER=icl -DCMAKE_Fortran_COMPILER=ifort", - "buildCommandArgs": "", - "ctestCommandArgs": "", - "inheritEnvironments": [ "msvc_x64_x64" ], - "variables": [ - { - "name": "BUILD_SHARED_LIBS", - "value": "True", - "type": "BOOL" - }, - { - "name": "BUILD_TOOLS", - "value": "True", - "type": "BOOL" - }, - { - "name": "LAMMPS_EXCEPTIONS", - "value": "True", - "type": "BOOL" - }, - { - "name": "PKG_PYTHON", - "value": "True", - "type": "BOOL" - }, - { - "name": "ENABLE_TESTING", - "value": "False", - "type": "BOOL" - }, - { - "name": "BUILD_MPI", - "value": "False", - "type": "BOOL" } ] } ] -} +} \ No newline at end of file