From aa17ec479ac7636ff7898a974e3308861b51fb6e Mon Sep 17 00:00:00 2001 From: Huang-Ming Huang Date: Tue, 15 Dec 2020 08:56:01 -0600 Subject: [PATCH 1/2] Fix build script with older version of cmake --- scripts/helpers/eosio.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/helpers/eosio.sh b/scripts/helpers/eosio.sh index 280d5ac05f7..95d33743b22 100755 --- a/scripts/helpers/eosio.sh +++ b/scripts/helpers/eosio.sh @@ -346,10 +346,10 @@ function ensure-libpq-and-libpqxx() { if [ ! -d ${OPT_DIR}/pqxx ]; then execute bash -c "cd $SRC_DIR && \ curl -L https://github.com/jtv/libpqxx/archive/7.2.1.tar.gz | tar zxvf - && \ - cd libpqxx-7.2.1 && \ - ${CMAKE} $CXX_SPEC $EXTRA_CMAKE_FLAGS -DCMAKE_INSTALL_PREFIX=${OPT_DIR}/pqxx -DSKIP_BUILD_TEST=ON -DCMAKE_BUILD_TYPE=Release -S . -B build && \ - ${CMAKE} --build build && ${CMAKE} --install build && \ - cd .. && rm -rf libpqxx-7.2.1" + cd libpqxx-7.2.1 && mkdir build && cd build && \ + ${CMAKE} $CXX_SPEC $EXTRA_CMAKE_FLAGS -DCMAKE_INSTALL_PREFIX=${OPT_DIR}/pqxx -DSKIP_BUILD_TEST=ON -DCMAKE_BUILD_TYPE=Release .. && \ + make -j${JOBS} && make install && \ + cd ../.. && rm -rf libpqxx-7.2.1" fi if [ -z "$PKG_CONFIG_PATH" ]; then From 3b3f0f748e9d8afbed30a855486ca41a69caa8ae Mon Sep 17 00:00:00 2001 From: Huang-Ming Huang Date: Sat, 12 Dec 2020 13:18:50 -0600 Subject: [PATCH 2/2] fix find pqxx --- plugins/blockvault_client_plugin/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/blockvault_client_plugin/CMakeLists.txt b/plugins/blockvault_client_plugin/CMakeLists.txt index b95a5cbe8d0..2ea8d58366c 100644 --- a/plugins/blockvault_client_plugin/CMakeLists.txt +++ b/plugins/blockvault_client_plugin/CMakeLists.txt @@ -21,7 +21,7 @@ pkg_check_modules(pqxx IMPORTED_TARGET libpqxx>=6.0) if (pqxx_FOUND) add_library(pqxx STATIC IMPORTED) - set_property(TARGET pqxx PROPERTY IMPORTED_LOCATION ${pqxx_STATIC_LIBRARY_DIRS}/libpqxx.a) + set_property(TARGET pqxx PROPERTY IMPORTED_LOCATION ${pqxx_LIBDIR}/libpqxx.a) target_include_directories(pqxx INTERFACE ${pqxx_STATIC_INCLUDE_DIRS}) target_link_libraries(pqxx INTERFACE PkgConfig::pq)