Skip to content

Commit b93fcc4

Browse files
committed
fix building on win
1 parent e74209c commit b93fcc4

File tree

3 files changed

+6
-9
lines changed

3 files changed

+6
-9
lines changed

src/CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ set(BA_SOURCES
2424
add_subdirectory(utils)
2525
add_subdirectory(coarse)
2626

27-
set(UMF_LIBS $<BUILD_INTERFACE:umf_utils> $<BUILD_INTERFACE:coarse>)
27+
set(UMF_LIBS $<BUILD_INTERFACE:umf_utils> $<BUILD_INTERFACE:coarse>
28+
$<BUILD_INTERFACE:disjoint_pool>)
2829

2930
if(LINUX)
3031
set(BA_SOURCES ${BA_SOURCES}
@@ -146,7 +147,7 @@ else()
146147
LIBS ${UMF_LIBS})
147148
endif()
148149

149-
add_dependencies(umf coarse)
150+
add_dependencies(umf coarse disjoint_pool)
150151

151152
if(UMF_LINK_HWLOC_STATICALLY)
152153
add_dependencies(umf ${UMF_HWLOC_NAME})

src/pool/CMakeLists.txt

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,13 @@ endif()
2525

2626
add_library(${PROJECT_NAME}::disjoint_pool ALIAS disjoint_pool)
2727

28-
add_dependencies(disjoint_pool umf)
29-
30-
target_link_libraries(disjoint_pool PRIVATE umf)
31-
3228
target_include_directories(
3329
disjoint_pool
3430
PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/umf/pools>
31+
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>
32+
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src/critnib>
3533
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
3634

37-
install(TARGETS disjoint_pool EXPORT ${PROJECT_NAME}-targets)
38-
3935
# libumf_pool_jemalloc
4036
if(UMF_BUILD_LIBUMF_POOL_JEMALLOC)
4137
add_umf_library(

src/pool/pool_disjoint_internal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include "uthash/utlist.h"
2525

2626
#include "base_alloc_global.h"
27-
#include "provider_tracking.h"
27+
#include "provider/provider_tracking.h"
2828
#include "utils_common.h"
2929
#include "utils_concurrency.h"
3030
#include "utils_log.h"

0 commit comments

Comments
 (0)