From d2230dec36ee6c9b233b4243477b20aadcfcfbf6 Mon Sep 17 00:00:00 2001 From: fpetrini15 Date: Thu, 7 Nov 2024 16:28:29 -0800 Subject: [PATCH] Install RHEL libs --- CMakeLists.txt | 5 +++-- src/c++/library/CMakeLists.txt | 12 ++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5f2e55c49..6a5c65dc2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -78,8 +78,8 @@ FetchContent_Declare( set(TRITON_THIRD_PARTY_INSTALL_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/third-party) FetchContent_MakeAvailable(repo-third-party) -# Some libs are installed to ${TRITON_THIRD_PARTY_INSTALL_PREFIX}/{LIB}/lib64 instead -# of ${TRITON_THIRD_PARTY_INSTALL_PREFIX}/{LIB}/lib on Centos +# Some libs are installed to ${TRITON_THIRD_PARTY_INSTALL_PREFIX}/lib64 instead +# of ${TRITON_THIRD_PARTY_INSTALL_PREFIX}/lib on Centos set (LIB_DIR "lib") if(LINUX) file(STRINGS "/etc/os-release" DISTRO_ID_LIKE REGEX "ID_LIKE") @@ -157,6 +157,7 @@ if(TRITON_ENABLE_CC_HTTP OR TRITON_ENABLE_CC_GRPC) -DTRITON_ENABLE_GPU:BOOL=${TRITON_ENABLE_GPU} -DTRITON_ENABLE_ZLIB:BOOL=${TRITON_ENABLE_ZLIB} -DTRITON_MIN_CXX_STANDARD:STRING=${TRITON_MIN_CXX_STANDARD} + -DLIB_DIR:STRING=${LIB_DIR} -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX:PATH=${TRITON_INSTALL_PREFIX} DEPENDS ${_cc_client_depends} diff --git a/src/c++/library/CMakeLists.txt b/src/c++/library/CMakeLists.txt index 7fa1ca9f7..6a80afcd0 100644 --- a/src/c++/library/CMakeLists.txt +++ b/src/c++/library/CMakeLists.txt @@ -300,12 +300,12 @@ if(TRITON_ENABLE_CC_GRPC) if (NOT WIN32) install( DIRECTORY - ${CMAKE_CURRENT_BINARY_DIR}/../../third-party/curl/lib/ - ${CMAKE_CURRENT_BINARY_DIR}/../../third-party/grpc/lib/ - ${CMAKE_CURRENT_BINARY_DIR}/../../third-party/protobuf/lib/ - ${CMAKE_CURRENT_BINARY_DIR}/../../third-party/c-ares/lib/ - ${CMAKE_CURRENT_BINARY_DIR}/../../third-party/absl/lib/ - ${CMAKE_CURRENT_BINARY_DIR}/../../third-party/re2/lib/ + ${CMAKE_CURRENT_BINARY_DIR}/../../third-party/curl/${LIB_DIR}/ + ${CMAKE_CURRENT_BINARY_DIR}/../../third-party/grpc/${LIB_DIR}/ + ${CMAKE_CURRENT_BINARY_DIR}/../../third-party/protobuf/${LIB_DIR}/ + ${CMAKE_CURRENT_BINARY_DIR}/../../third-party/c-ares/${LIB_DIR}/ + ${CMAKE_CURRENT_BINARY_DIR}/../../third-party/absl/${LIB_DIR}/ + ${CMAKE_CURRENT_BINARY_DIR}/../../third-party/re2/${LIB_DIR}/ DESTINATION ${CMAKE_INSTALL_LIBDIR} FILES_MATCHING PATTERN "*\.a"