Merge pull request #9874 from EOSIO/keke_epe561_cmake3.10

Fix build problem on cmake 3.10
EOSIO · Jan 6, 2021 · 563a46a · 563a46a
2 parents c7fc449 + 89561cf
commit 563a46a
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/plugins/blockvault_client_plugin/CMakeLists.txt b/plugins/blockvault_client_plugin/CMakeLists.txt
@@ -28,18 +28,17 @@ if (pqxx_FOUND)
       # Linking libpqxx from homebrew statically could generate `different visibility settings` warnings.
       # As a result, we'll just use link it dynamically for now. 
       ##################################################################################################
-      set(pqxx_lib PkgConfig::pqxx PkgConfig::pq)
+      set(pqxx_lib PkgConfig::pqxx )
    else()
       add_library(pqxx STATIC IMPORTED)
       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)
+      set_property(TARGET pqxx PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${pqxx_STATIC_INCLUDE_DIRS})
       set(pqxx_lib pqxx)
    endif()
 
    add_library(blockvault postgres_backend.cpp)
    target_include_directories(blockvault PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
-   target_link_libraries(blockvault PUBLIC ${pqxx_lib} eosio_chain)
+   target_link_libraries(blockvault PUBLIC ${pqxx_lib} PkgConfig::pq eosio_chain)
 
    target_link_libraries( blockvault_client_plugin blockvault)
    target_compile_definitions(blockvault_client_plugin PRIVATE HAS_PQXX)