From 56d52d80ba6e8e86827756415d4623cd71cd4a35 Mon Sep 17 00:00:00 2001 From: Nikolai Maas Date: Wed, 20 Nov 2024 09:01:04 +0100 Subject: [PATCH] windows 2 --- .github/workflows/master_ci.yml | 4 +--- CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/master_ci.yml b/.github/workflows/master_ci.yml index 3ee7abbb1..1a578a17a 100644 --- a/.github/workflows/master_ci.yml +++ b/.github/workflows/master_ci.yml @@ -229,9 +229,7 @@ jobs: shell: msys2 {0} run: | cd build - ls - ls tests - ./tests/mtkahypar_tests.exe + ./tests/mtkahypar_tests # mt_kahypar_macos_build: # name: MacOS Build diff --git a/CMakeLists.txt b/CMakeLists.txt index e9bbc6d68..5a5aa1469 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,8 +32,8 @@ if (POLICY CMP0167) # new FindBoost behavior cmake_policy(SET CMP0167 NEW) endif() -if (NOT DEFINED BUILD_SHARED_LIBS) - # since TBB does not support static linking, we build with dynamic linking by default +if (NOT DEFINED BUILD_SHARED_LIBS AND NOT WIN32) + # since TBB does not support static linking, we build with dynamic linking by default (except on Windows) set(BUILD_SHARED_LIBS ON) endif()