Skip to content
This repository has been archived by the owner on Aug 2, 2022. It is now read-only.

Fix build script problem with older version of cmake #9787

Merged
merged 2 commits into from
Dec 16, 2020
Merged

Fix build script problem with older version of cmake #9787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa17ec4
Fix build script with older version of cmake
huangminghuang Dec 15, 2020
3b3f0f7
fix find pqxx
huangminghuang Dec 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion plugins/blockvault_client_plugin/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
8 changes: 4 additions & 4 deletions scripts/helpers/eosio.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down