From d905d3fbf5bfd4fa9f48240bc13b589e726ca70e Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Sun, 22 May 2022 17:46:12 -0400 Subject: [PATCH] reorganize build settings and presets --- cmake/CMakeSettings.json | 94 ++++++++++++------------------------- cmake/presets/windows.cmake | 2 + 2 files changed, 33 insertions(+), 63 deletions(-) diff --git a/cmake/CMakeSettings.json b/cmake/CMakeSettings.json index b0f940277f..6d4894f5c2 100644 --- a/cmake/CMakeSettings.json +++ b/cmake/CMakeSettings.json @@ -8,7 +8,7 @@ "installRoot": "${workspaceRoot}\\install\\${name}", "cmakeCommandArgs": "-C ${workspaceRoot}\\cmake\\presets\\windows.cmake", "buildCommandArgs": "", - "ctestCommandArgs": "", + "ctestCommandArgs": "-V", "inheritEnvironments": [ "msvc_x64_x64" ], "variables": [ { @@ -26,11 +26,6 @@ "value": "True", "type": "BOOL" }, - { - "name": "PKG_PYTHON", - "value": "True", - "type": "BOOL" - }, { "name": "ENABLE_TESTING", "value": "True", @@ -46,7 +41,7 @@ "installRoot": "${workspaceRoot}\\install\\${name}", "cmakeCommandArgs": "-C ${workspaceRoot}\\cmake\\presets\\windows.cmake", "buildCommandArgs": "", - "ctestCommandArgs": "", + "ctestCommandArgs": "-V", "inheritEnvironments": [ "msvc_x64_x64" ], "variables": [ { @@ -64,11 +59,6 @@ "value": "True", "type": "BOOL" }, - { - "name": "PKG_PYTHON", - "value": "True", - "type": "BOOL" - }, { "name": "ENABLE_TESTING", "value": "True", @@ -102,11 +92,6 @@ "value": "True", "type": "BOOL" }, - { - "name": "PKG_PYTHON", - "value": "True", - "type": "BOOL" - }, { "name": "ENABLE_TESTING", "value": "True", @@ -122,7 +107,7 @@ "installRoot": "${workspaceRoot}\\install\\${name}", "cmakeCommandArgs": "-C ${workspaceRoot}\\cmake\\presets\\windows.cmake -DCMAKE_C_COMPILER=clang-cl.exe -DCMAKE_CXX_COMPILER=clang-cl.exe", "buildCommandArgs": "", - "ctestCommandArgs": "", + "ctestCommandArgs": "-V", "inheritEnvironments": [ "clang_cl_x64" ], "variables": [ { @@ -140,11 +125,6 @@ "value": "True", "type": "BOOL" }, - { - "name": "PKG_PYTHON", - "value": "True", - "type": "BOOL" - }, { "name": "ENABLE_TESTING", "value": "True", @@ -158,9 +138,16 @@ "configurationType": "Debug", "buildRoot": "${workspaceRoot}\\build\\${name}", "installRoot": "${workspaceRoot}\\install\\${name}", + "buildCommandArgs": "", + "ctestCommandArgs": "-V", "inheritEnvironments": [], "cmakeCommandArgs": "-C ${workspaceRoot}\\cmake\\presets\\windows-intel-llvm.cmake -C ${workspaceRoot}\\cmake\\presets\\windows.cmake", "variables": [ + { + "name": "PKG_ELECTRON", + "value": "True", + "type": "BOOL" + }, { "name": "BUILD_SHARED_LIBS", "value": "True", @@ -176,11 +163,6 @@ "value": "True", "type": "BOOL" }, - { - "name": "PKG_PYTHON", - "value": "True", - "type": "BOOL" - }, { "name": "ENABLE_TESTING", "value": "True", @@ -190,11 +172,6 @@ "name": "FFT", "value": "MKL", "type": "STRING" - }, - { - "name": "PKG_PLUGIN", - "value": "True", - "type": "BOOL" } ] }, @@ -205,8 +182,15 @@ "buildRoot": "${workspaceRoot}\\build\\${name}", "installRoot": "${workspaceRoot}\\install\\${name}", "cmakeCommandArgs": "-C ${workspaceRoot}\\cmake\\presets\\windows-intel-llvm.cmake -C ${workspaceRoot}\\cmake\\presets\\windows.cmake", + "buildCommandArgs": "", + "ctestCommandArgs": "-V", "inheritEnvironments": [], "variables": [ + { + "name": "PKG_ELECTRON", + "value": "True", + "type": "BOOL" + }, { "name": "BUILD_SHARED_LIBS", "value": "True", @@ -222,11 +206,6 @@ "value": "True", "type": "BOOL" }, - { - "name": "PKG_PYTHON", - "value": "True", - "type": "BOOL" - }, { "name": "ENABLE_TESTING", "value": "True", @@ -236,11 +215,6 @@ "name": "FFT", "value": "MKL", "type": "STRING" - }, - { - "name": "PKG_PLUGIN", - "value": "True", - "type": "BOOL" } ] }, @@ -251,8 +225,15 @@ "buildRoot": "${workspaceRoot}\\build\\${name}", "installRoot": "${workspaceRoot}\\install\\${name}", "cmakeCommandArgs": "-C ${workspaceRoot}\\cmake\\presets\\windows-intel-classic.cmake -C ${workspaceRoot}\\cmake\\presets\\windows.cmake", + "buildCommandArgs": "", + "ctestCommandArgs": "-V", "inheritEnvironments": [], "variables": [ + { + "name": "PKG_ELECTRON", + "value": "True", + "type": "BOOL" + }, { "name": "BUILD_SHARED_LIBS", "value": "True", @@ -268,11 +249,6 @@ "value": "True", "type": "BOOL" }, - { - "name": "PKG_PYTHON", - "value": "True", - "type": "BOOL" - }, { "name": "ENABLE_TESTING", "value": "False", @@ -282,11 +258,6 @@ "name": "FFT", "value": "MKL", "type": "STRING" - }, - { - "name": "PKG_PLUGIN", - "value": "True", - "type": "BOOL" } ] }, @@ -297,8 +268,15 @@ "buildRoot": "${workspaceRoot}\\build\\${name}", "installRoot": "${workspaceRoot}\\install\\${name}", "cmakeCommandArgs": "-C ${workspaceRoot}\\cmake\\presets\\windows-intel-classic.cmake -C ${workspaceRoot}\\cmake\\presets\\windows.cmake", + "buildCommandArgs": "", + "ctestCommandArgs": "-V", "inheritEnvironments": [], "variables": [ + { + "name": "PKG_ELECTRON", + "value": "True", + "type": "BOOL" + }, { "name": "BUILD_SHARED_LIBS", "value": "True", @@ -314,11 +292,6 @@ "value": "True", "type": "BOOL" }, - { - "name": "PKG_PYTHON", - "value": "True", - "type": "BOOL" - }, { "name": "ENABLE_TESTING", "value": "False", @@ -328,11 +301,6 @@ "name": "FFT", "value": "MKL", "type": "STRING" - }, - { - "name": "PKG_PLUGIN", - "value": "True", - "type": "BOOL" } ] } diff --git a/cmake/presets/windows.cmake b/cmake/presets/windows.cmake index c83b16d855..5a3ac217f1 100644 --- a/cmake/presets/windows.cmake +++ b/cmake/presets/windows.cmake @@ -9,6 +9,7 @@ set(WIN_PACKAGES CLASS2 COLLOID COLVARS + COMPRESS CORESHELL DIELECTRIC DIFFRACTION @@ -43,6 +44,7 @@ set(WIN_PACKAGES PERI PHONON POEMS + PLUGIN PTM QEQ QTB