Skip to content

Commit db47b9e

Browse files
authored
Merge pull request #785 from ldorau/Fix_add_some_missing_LIBRARY_DIRS_to_target_link_directories
Fix: add some missing *_LIBRARY_DIRS to target_link_directories()
2 parents 52578e6 + 7fb8bcc commit db47b9e

File tree

1 file changed

+22
-15
lines changed

1 file changed

+22
-15
lines changed

examples/CMakeLists.txt

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,8 @@ function(build_umf_ipc_example name)
171171
${EX_NAME} PRIVATE ${UMF_CMAKE_SOURCE_DIR}/src/utils
172172
${UMF_CMAKE_SOURCE_DIR}/include)
173173

174-
target_link_directories(${EX_NAME} PRIVATE ${LIBHWLOC_LIBRARY_DIRS})
174+
target_link_directories(${EX_NAME} PRIVATE ${LIBHWLOC_LIBRARY_DIRS}
175+
${TBB_LIBRARY_DIRS})
175176
endforeach(loop_var)
176177
endfunction()
177178

@@ -192,7 +193,7 @@ function(add_umf_ipc_example script)
192193
endif()
193194
endfunction()
194195

195-
if(LINUX)
196+
if(LINUX AND UMF_POOL_SCALABLE_ENABLED)
196197
build_umf_ipc_example(ipc_ipcapi)
197198
add_umf_ipc_example(ipc_ipcapi_anon_fd)
198199
add_umf_ipc_example(ipc_ipcapi_shm)
@@ -252,23 +253,26 @@ if(LINUX)
252253
set_tests_properties(${EXAMPLE_NAME} PROPERTIES
253254
SKIP_RETURN_CODE ${UMF_TEST_SKIP_RETURN_CODE})
254255

255-
set(EXAMPLE_NAME umf_example_custom_file_provider)
256+
if(UMF_POOL_SCALABLE_ENABLED)
257+
set(EXAMPLE_NAME umf_example_custom_file_provider)
256258

257-
add_umf_executable(
258-
NAME ${EXAMPLE_NAME}
259-
SRCS custom_file_provider/custom_file_provider.c
260-
LIBS umf ${LIBHWLOC_LIBRARIES})
259+
add_umf_executable(
260+
NAME ${EXAMPLE_NAME}
261+
SRCS custom_file_provider/custom_file_provider.c
262+
LIBS umf ${LIBHWLOC_LIBRARIES})
261263

262-
target_include_directories(
263-
${EXAMPLE_NAME} PRIVATE ${UMF_CMAKE_SOURCE_DIR}/src/utils
264-
${UMF_CMAKE_SOURCE_DIR}/include)
264+
target_include_directories(
265+
${EXAMPLE_NAME} PRIVATE ${UMF_CMAKE_SOURCE_DIR}/src/utils
266+
${UMF_CMAKE_SOURCE_DIR}/include)
265267

266-
target_link_directories(${EXAMPLE_NAME} PRIVATE ${LIBHWLOC_LIBRARY_DIRS})
268+
target_link_directories(${EXAMPLE_NAME} PRIVATE
269+
${LIBHWLOC_LIBRARY_DIRS} ${TBB_LIBRARY_DIRS})
267270

268-
add_test(
269-
NAME ${EXAMPLE_NAME}
270-
COMMAND ${EXAMPLE_NAME}
271-
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
271+
add_test(
272+
NAME ${EXAMPLE_NAME}
273+
COMMAND ${EXAMPLE_NAME}
274+
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
275+
endif()
272276

273277
if(UMF_POOL_JEMALLOC_ENABLED)
274278
set(EXAMPLE_NAME umf_example_dram_and_fsdax)
@@ -278,6 +282,9 @@ if(LINUX)
278282
SRCS dram_and_fsdax/dram_and_fsdax.c
279283
LIBS umf jemalloc_pool)
280284

285+
target_link_directories(${EXAMPLE_NAME} PRIVATE
286+
${LIBHWLOC_LIBRARY_DIRS})
287+
281288
add_test(
282289
NAME ${EXAMPLE_NAME}
283290
COMMAND ${EXAMPLE_NAME}

0 commit comments

Comments
 (0)