diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 59a9283..91b45f0 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -129,7 +129,7 @@ jobs: - name: Build run: | - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib:/usr/local/lib/x86_64-linux-gnu mkdir -p build cd build @@ -148,7 +148,7 @@ jobs: - name: Test run: | - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib:/usr/local/lib/x86_64-linux-gnu # use etcd v3 api export ETCDCTL_API="3" @@ -171,7 +171,7 @@ jobs: - name: Authentication Test run: | - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib:/usr/local/lib/x86_64-linux-gnu # use etcd v3 api export ETCDCTL_API="3" @@ -212,7 +212,7 @@ jobs: - name: Transport Security and Authentication Test run: | - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib:/usr/local/lib/x86_64-linux-gnu # use etcd v3 api export ETCDCTL_API="3" diff --git a/CMakeLists.txt b/CMakeLists.txt index 9607774..721f989 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,7 +31,7 @@ option(BUILD_ETCD_TESTS "Build test cases" OFF) # reference: https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling#always-full-rpath set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) -set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib:${CMAKE_INSTALL_PREFIX}/lib64") +set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib:${CMAKE_INSTALL_PREFIX}/lib64:${CMAKE_INSTALL_PREFIX}/lib/x86_64-linux-gnu") set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) if(MSVC)