Skip to content

Clean up CMake definitions #314

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 8, 2024
Merged

Clean up CMake definitions #314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0ad125
Clean up defining UMF_BUILD_LEVEL_ZERO_PROVIDER
ldorau Mar 8, 2024
3855475
Move defining LIBS_POOL_SCALABLE
ldorau Mar 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,8 @@ if(UMF_BUILD_LEVEL_ZERO_PROVIDER)
set(UMF_SOURCES_LINUX ${UMF_SOURCES_LINUX}
provider/provider_level_zero.c)

if(LINUX)
set(UMF_COMPILE_DEFINITIONS ${UMF_COMPILE_DEFINITIONS}
"UMF_BUILD_LEVEL_ZERO_PROVIDER=1")
endif()
set(UMF_COMPILE_DEFINITIONS ${UMF_COMPILE_DEFINITIONS}
"UMF_BUILD_LEVEL_ZERO_PROVIDER=1")
endif()

if(LINUX)
Expand Down
12 changes: 6 additions & 6 deletions src/pool/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,14 @@ if(UMF_BUILD_LIBUMF_POOL_JEMALLOC)
endif()

# libumf_pool_scalable
if(LINUX)
set(LIBS_POOL_SCALABLE dl umf_utils)
elseif(WINDOWS)
set(LIBS_POOL_SCALABLE umf_utils)
endif()

if(UMF_BUILD_LIBUMF_POOL_SCALABLE)
if(LINUX OR WINDOWS)
if(LINUX)
set(LIBS_POOL_SCALABLE dl umf_utils)
elseif(WINDOWS)
set(LIBS_POOL_SCALABLE umf_utils)
endif()

add_umf_library(NAME scalable_pool
TYPE STATIC
SRCS pool_scalable.c ${POOL_EXTRA_SRCS}
Expand Down