From ddb1a94a82cca840495f6b41b0188a7207e03947 Mon Sep 17 00:00:00 2001 From: "r.jaepel" Date: Thu, 29 Feb 2024 14:06:49 +0100 Subject: [PATCH 1/2] Add statically linked libraries to debug and test build --- CMakeSettings.json | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/CMakeSettings.json b/CMakeSettings.json index c0976aa07..b8565990c 100644 --- a/CMakeSettings.json +++ b/CMakeSettings.json @@ -14,7 +14,7 @@ "configurationType": "Debug", "inheritEnvironments": [ "msvc_x64_x64" ], "buildRoot": "${env.BUILDROOT}", - "cmakeCommandArgs": "-DVCPKG_TARGET_TRIPLET=x64-windows-static -DENABLE_TESTS=OFF -DENABLE_ANALYTIC_JACOBIAN_CHECK=OFF --fresh", + "cmakeCommandArgs": "-DVCPKG_TARGET_TRIPLET=x64-windows-static -DENABLE_STATIC_LINK_LAPACK=ON -DENABLE_STATIC_LINK_DEPS=ON -DENABLE_TESTS=OFF -DENABLE_ANALYTIC_JACOBIAN_CHECK=OFF --fresh", "buildCommandArgs": "-m -v:minimal", "variables": [ { @@ -23,10 +23,15 @@ "type": "STRING" }, { - "name": "BUILD_SHARED_LIBS", + "name": "HDF5_USE_STATIC_LIBRARIES", "value": "1", "type": "STRING" }, + { + "name": "BUILD_SHARED_LIBS", + "value": "0", + "type": "STRING" + }, { "name": "BLA_VENDOR", "value": "${env.BLAS_DEBUG}", From 191b402a07883acef0dea2818886f233d4e6ada5 Mon Sep 17 00:00:00 2001 From: "r.jaepel" Date: Thu, 29 Feb 2024 14:07:08 +0100 Subject: [PATCH 2/2] Add TEST_HDF5_TARGETS to testRunner --- test/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 8bb060f51..5a89fd8bd 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -68,6 +68,7 @@ endif() list(APPEND TEST_LIBCADET_TARGETS testRunner) list(APPEND TEST_NONLINALG_TARGETS testRunner) +list(APPEND TEST_HDF5_TARGETS testRunner) list(APPEND TEST_TARGETS ${TEST_NONLINALG_TARGETS} ${TEST_LIBCADET_TARGETS} ${TEST_HDF5_TARGETS} testLogging)