Skip to content

Commit

Permalink
[gloo] reenable libuv build (2/N)
Browse files Browse the repository at this point in the history
Summary:
As part of reviving CI, reenable libuv that is causing CI errors.

Test Plan:
Test on github.

Reviewers:

Subscribers:

Tasks:

Tags:

ghstack-source-id: a6934ab5c30e55816477e00a3cfe4e8926adbbcf
Pull Request resolved: #396
  • Loading branch information
c-p-i-o committed Nov 18, 2024
1 parent 8a3d399 commit c97071d
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 13 deletions.
11 changes: 5 additions & 6 deletions gloo/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -94,13 +94,12 @@ else()
set(GLOO_HAVE_TRANSPORT_IBVERBS 0)
endif()

# TODO: turn ths back on once tests are passing again.
# Compile uv transport if libuv is available
#if(USE_LIBUV)
# set(GLOO_HAVE_TRANSPORT_UV 1)
#else()
# set(GLOO_HAVE_TRANSPORT_UV 0)
#endif()
if(USE_LIBUV)
set(GLOO_HAVE_TRANSPORT_UV 1)
else()
set(GLOO_HAVE_TRANSPORT_UV 0)
endif()

add_subdirectory(common)
add_subdirectory(mpi)
Expand Down
13 changes: 6 additions & 7 deletions gloo/test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,12 @@ endif()
add_executable(gloo_test ${GLOO_TEST_SRCS})
target_link_libraries(gloo_test gloo gtest ${GLOO_TEST_LIBRARIES} OpenSSL::SSL OpenSSL::Crypto)

#TODO: re-enable LIBUV once CI is green again
#if(MSVC AND USE_LIBUV)
# add_custom_command(TARGET gloo_test POST_BUILD
# COMMAND ${CMAKE_COMMAND} -E copy_if_different
# "${libuv_DLL_PATH}"
# $<TARGET_FILE_DIR:gloo_test>)
#endif()
if(MSVC AND USE_LIBUV)
add_custom_command(TARGET gloo_test POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
"${libuv_DLL_PATH}"
$<TARGET_FILE_DIR:gloo_test>)
endif()

if(USE_CUDA)
if(NOT MSVC)
Expand Down

0 comments on commit c97071d

Please sign in to comment.