Skip to content

Commit c00e25c

Browse files
committed
UMF_BUILD_SHARED_LIBRARY=ON requires UMF_BUILD_OS_MEMORY_PROVIDER=ON
UMF_BUILD_SHARED_LIBRARY=ON requires UMF_BUILD_OS_MEMORY_PROVIDER=ON on Windows because libumf.def contains the umfOsMemoryProviderOps symbol that is unresolved on Windows if UMF_BUILD_OS_MEMORY_PROVIDER=OFF. Signed-off-by: Lukasz Dorau <[email protected]>
1 parent ae5c42c commit c00e25c

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

.github/workflows/basic.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -197,12 +197,6 @@ jobs:
197197
pool_tracking: 'ON'
198198
shared_library: 'ON'
199199
os_provider: 'ON'
200-
- os: 'windows-2022'
201-
build_type: Release
202-
compiler: {c: cl, cxx: cl}
203-
pool_tracking: 'ON'
204-
shared_library: 'ON'
205-
os_provider: 'OFF'
206200

207201
runs-on: ${{matrix.os}}
208202

src/CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,12 @@ elseif(MACOSX)
8484
endif()
8585

8686
if(UMF_BUILD_SHARED_LIBRARY)
87+
if(WINDOWS AND (NOT UMF_BUILD_OS_MEMORY_PROVIDER))
88+
# UMF_BUILD_SHARED_LIBRARY=ON requires UMF_BUILD_OS_MEMORY_PROVIDER=ON on Windows
89+
# because libumf.def contains the umfOsMemoryProviderOps symbol
90+
# that is unresolved on Windows if UMF_BUILD_OS_MEMORY_PROVIDER=OFF
91+
message(FATAL_ERROR "UMF_BUILD_SHARED_LIBRARY=ON requires UMF_BUILD_OS_MEMORY_PROVIDER=ON on Windows")
92+
endif()
8793
add_umf_library(NAME umf
8894
TYPE SHARED
8995
SRCS ${UMF_SOURCES}

0 commit comments

Comments
 (0)