From 252ce113a580c544fc359af1cb26b95a92d484aa Mon Sep 17 00:00:00 2001 From: Kae <80987908+Novaenia@users.noreply.github.com> Date: Sun, 17 Mar 2024 13:45:30 +1100 Subject: [PATCH] add missing vars to linux and macOS CMakePresets --- source/CMakePresets.json | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/source/CMakePresets.json b/source/CMakePresets.json index 97e4d7e..d6151bc 100644 --- a/source/CMakePresets.json +++ b/source/CMakePresets.json @@ -48,7 +48,9 @@ "CMAKE_BUILD_TYPE": "Release", "VCPKG_TARGET_TRIPLET": "x64-linux-mixed", "CMAKE_INCLUDE_PATH": "${sourceParentDir}/lib/linux/include", - "CMAKE_LIBRARY_PATH": "${sourceParentDir}/lib/linux" + "CMAKE_LIBRARY_PATH": "${sourceParentDir}/lib/linux", + "STAR_ENABLE_STATIC_LIBGCC_LIBSTDCXX": true, + "STAR_USE_JEMALLOC": true }, "vendor": { "microsoft.com/VisualStudioSettings/CMake/1.0": { @@ -65,7 +67,9 @@ "CMAKE_BUILD_TYPE": "Release", "VCPKG_TARGET_TRIPLET": "x64-osx-mixed", "CMAKE_INCLUDE_PATH": "${sourceParentDir}/lib/osx/include", - "CMAKE_LIBRARY_PATH": "${sourceParentDir}/lib/osx/x64;${sourceParentDir}/lib/osx" + "CMAKE_LIBRARY_PATH": "${sourceParentDir}/lib/osx/x64;${sourceParentDir}/lib/osx", + "STAR_ENABLE_STATIC_LIBGCC_LIBSTDCXX": true, + "STAR_USE_JEMALLOC": false }, "vendor": { "microsoft.com/VisualStudioSettings/CMake/1.0": { @@ -105,24 +109,30 @@ ], "testPresets": [ { + "name": "base", + "hidden": true, + "output": { "outputOnFailure": true }, + "filter": { "include": { "label": "NoAssets" } } + }, + { + "inherits": "base", "name": "windows-release", - "configurePreset": "windows-release", - "filter": { "include": { "label": "NoAssets" } } + "configurePreset": "windows-release" }, { + "inherits": "base", "name": "linux-release", - "configurePreset": "linux-release", - "filter": { "include": { "label": "NoAssets" } } + "configurePreset": "linux-release" }, { + "inherits": "base", "name": "macos-release", - "configurePreset": "macos-release", - "filter": { "include": { "label": "NoAssets" } } + "configurePreset": "macos-release" }, { + "inherits": "base", "name": "macos-arm-release", - "configurePreset": "macos-arm-release", - "filter": { "include": { "label": "NoAssets" } } + "configurePreset": "macos-arm-release" } ] } \ No newline at end of file