��diff --git a/benchmark/CMakeLists.txt b/benchmark/CMakeLists.txt index 5605519..8cdf3f2 100644 --- a/benchmark/CMakeLists.txt +++ b/benchmark/CMakeLists.txt @@ -51,7 +51,7 @@ function(add_umf_benchmark) set(BENCH_NAME umf-${ARG_NAME}) - set(BENCH_LIBS ${ARG_LIBS} umf) + set(BENCH_LIBS ${ARG_LIBS} libumf) add_umf_executable( NAME ${BENCH_NAME} diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 942579a..2273255 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -18,7 +18,7 @@ set(EXAMPLE_NAME umf_example_basic) add_umf_executable( NAME ${EXAMPLE_NAME} SRCS basic/basic.c - LIBS umf ${LIBHWLOC_LIBRARIES}) + LIBS libumf ${LIBHWLOC_LIBRARIES}) target_include_directories( ${EXAMPLE_NAME} PRIVATE ${UMF_CMAKE_SOURCE_DIR}/src/utils @@ -50,7 +50,7 @@ if(UMF_BUILD_GPU_EXAMPLES NAME ${EXAMPLE_NAME} SRCS level_zero_shared_memory/level_zero_shared_memory.c common/examples_level_zero_helpers.c - LIBS disjoint_pool ze_loader umf) + LIBS disjoint_pool ze_loader libumf) target_include_directories( ${EXAMPLE_NAME} @@ -87,7 +87,7 @@ if(UMF_BUILD_GPU_EXAMPLES add_umf_executable( NAME ${EXAMPLE_NAME} SRCS cuda_shared_memory/cuda_shared_memory.c - LIBS disjoint_pool cuda umf) + LIBS disjoint_pool cuda libumf) target_include_directories( ${EXAMPLE_NAME} @@ -129,7 +129,7 @@ if(UMF_BUILD_GPU_EXAMPLES NAME ${EXAMPLE_NAME} SRCS ipc_level_zero/ipc_level_zero.c common/examples_level_zero_helpers.c - LIBS disjoint_pool ze_loader umf) + LIBS disjoint_pool ze_loader libumf) target_include_directories( ${EXAMPLE_NAME} @@ -167,7 +167,7 @@ function(build_umf_ipc_example name) add_umf_executable( NAME ${EX_NAME} SRCS ipc_ipcapi/${BASE_NAME}_${loop_var}.c - LIBS umf) + LIBS libumf) target_include_directories( ${EX_NAME} PRIVATE ${UMF_CMAKE_SOURCE_DIR}/src/utils @@ -214,7 +214,7 @@ if(LINUX) add_umf_executable( NAME ${EXAMPLE_NAME} SRCS memspace_numa/memspace_numa.c - LIBS umf ${LIBHWLOC_LIBRARIES} numa) + LIBS libumf ${LIBHWLOC_LIBRARIES} numa) target_include_directories( ${EXAMPLE_NAME} @@ -237,7 +237,7 @@ if(LINUX) add_umf_executable( NAME ${EXAMPLE_NAME} SRCS memspace_hmat/memspace_hmat.c - LIBS umf ${LIBHWLOC_LIBRARIES} numa) + LIBS libumf ${LIBHWLOC_LIBRARIES} numa) target_include_directories( ${EXAMPLE_NAME} @@ -261,7 +261,7 @@ if(LINUX) add_umf_executable( NAME ${EXAMPLE_NAME} SRCS custom_file_provider/custom_file_provider.c - LIBS umf ${LIBHWLOC_LIBRARIES}) + LIBS libumf ${LIBHWLOC_LIBRARIES}) target_include_directories( ${EXAMPLE_NAME} PRIVATE ${UMF_CMAKE_SOURCE_DIR}/src/utils @@ -282,7 +282,7 @@ if(LINUX) add_umf_executable( NAME ${EXAMPLE_NAME} SRCS dram_and_fsdax/dram_and_fsdax.c - LIBS umf jemalloc_pool) + LIBS libumf jemalloc_pool) target_link_directories(${EXAMPLE_NAME} PRIVATE ${LIBHWLOC_LIBRARY_DIRS}) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 57050e8..ddcef98 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -138,7 +138,7 @@ if(UMF_BUILD_SHARED_LIBRARY) set(HWLOC_LIB ${UMF_HWLOC_NAME}) endif() add_umf_library( - NAME umf + NAME libumf TYPE SHARED SRCS ${UMF_SOURCES} LIBS ${UMF_LIBS} ${HWLOC_LIB} @@ -147,25 +147,25 @@ if(UMF_BUILD_SHARED_LIBRARY) set(UMF_COMMON_COMPILE_DEFINITIONS ${UMF_COMMON_COMPILE_DEFINITIONS} "UMF_SHARED_LIBRARY") set_target_properties( - umf + libumf PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_UMF_OUTPUT_DIRECTORY} VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR}) else() add_umf_library( - NAME umf + NAME libumf TYPE STATIC SRCS ${UMF_SOURCES} LIBS ${UMF_LIBS}) endif() if(UMF_LINK_HWLOC_STATICALLY) - add_dependencies(umf ${UMF_HWLOC_NAME}) + add_dependencies(libumf ${UMF_HWLOC_NAME}) endif() -target_link_directories(umf PRIVATE ${UMF_PRIVATE_LIBRARY_DIRS}) +target_link_directories(libumf PRIVATE ${UMF_PRIVATE_LIBRARY_DIRS}) -target_compile_definitions(umf PRIVATE ${UMF_COMMON_COMPILE_DEFINITIONS}) +target_compile_definitions(libumf PRIVATE ${UMF_COMMON_COMPILE_DEFINITIONS}) if(UMF_BUILD_LEVEL_ZERO_PROVIDER) if(LINUX) @@ -185,22 +185,22 @@ if(UMF_BUILD_CUDA_PROVIDER) "UMF_BUILD_CUDA_PROVIDER=1") endif() -add_library(${PROJECT_NAME}::umf ALIAS umf) +add_library(${PROJECT_NAME}::libumf ALIAS libumf) if(LIBHWLOC_INCLUDE_DIRS) - target_include_directories(umf PRIVATE ${LIBHWLOC_INCLUDE_DIRS}) + target_include_directories(libumf PRIVATE ${LIBHWLOC_INCLUDE_DIRS}) endif() if(LEVEL_ZERO_INCLUDE_DIRS) - target_include_directories(umf PRIVATE ${LEVEL_ZERO_INCLUDE_DIRS}) + target_include_directories(libumf PRIVATE ${LEVEL_ZERO_INCLUDE_DIRS}) endif() if(CUDA_INCLUDE_DIRS) - target_include_directories(umf PRIVATE ${CUDA_INCLUDE_DIRS}) + target_include_directories(libumf PRIVATE ${CUDA_INCLUDE_DIRS}) endif() target_include_directories( - umf + libumf PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/ravl> @@ -211,7 +211,7 @@ target_include_directories( $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/uthash> $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>) -install(TARGETS umf EXPORT ${PROJECT_NAME}-targets) +install(TARGETS libumf EXPORT ${PROJECT_NAME}-targets) add_subdirectory(pool) diff --git a/src/pool/CMakeLists.txt b/src/pool/CMakeLists.txt index bdd196b..6f54121 100644 --- a/src/pool/CMakeLists.txt +++ b/src/pool/CMakeLists.txt @@ -27,9 +27,9 @@ if(UMF_BUILD_LIBUMF_POOL_DISJOINT) add_library(${PROJECT_NAME}::disjoint_pool ALIAS disjoint_pool) - add_dependencies(disjoint_pool umf) + add_dependencies(disjoint_pool libumf) - target_link_libraries(disjoint_pool PRIVATE umf) + target_link_libraries(disjoint_pool PRIVATE libumf) target_include_directories( disjoint_pool diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index c8b854b..98b059c 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -54,7 +54,7 @@ function(build_umf_test) ${ARG_LIBS} GTest::gtest_main ${LIBS_OPTIONAL} - umf) + libumf) add_umf_executable( NAME ${TEST_TARGET_NAME}