Skip to content

Commit

Permalink
Merge pull request #469 from rapidsai/branch-22.02
Browse files Browse the repository at this point in the history
[gpuCI] Forward-merge branch-22.02 to branch-22.04 [skip gpuci]
  • Loading branch information
GPUtester authored Jan 28, 2022
2 parents e58835b + 5c96e3a commit 727419d
Showing 1 changed file with 12 additions and 6 deletions.
18 changes: 12 additions & 6 deletions cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -180,9 +180,6 @@ if(RAFT_COMPILE_LIBRARIES)
target_compile_definitions(raft_distance_lib
INTERFACE "RAFT_DISTANCE_COMPILED")

install(TARGETS raft_distance_lib
DESTINATION ${lib_dir}
EXPORT raft-distance-exports)
endif()

target_link_libraries(raft_distance INTERFACE raft::raft
Expand Down Expand Up @@ -220,9 +217,6 @@ if(RAFT_COMPILE_LIBRARIES)
target_compile_definitions(raft_nn_lib
INTERFACE "RAFT_NN_COMPILED")

install(TARGETS raft_nn_lib
DESTINATION ${lib_dir}
EXPORT raft-nn-exports)
endif()

target_link_libraries(raft_nn INTERFACE raft::raft faiss::faiss
Expand All @@ -245,6 +239,18 @@ install(TARGETS raft_nn
DESTINATION ${lib_dir}
EXPORT raft-nn-exports)

if(TARGET raft_distance_lib)
install(TARGETS raft_distance_lib
DESTINATION ${lib_dir}
EXPORT raft-distance-exports)
endif()

if(TARGET raft_nn_lib)
install(TARGETS raft_nn_lib
DESTINATION ${lib_dir}
EXPORT raft-nn-exports)
endif()


install(DIRECTORY include/raft/
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/raft
Expand Down

0 comments on commit 727419d

Please sign in to comment.