diff --git a/CMakeLists.txt b/CMakeLists.txt index c1e186f..85d611b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -103,9 +103,8 @@ find_package(zeep 6.0.4 REQUIRED) find_package(cifpp 5.1.1 REQUIRED) find_package(libmcfp REQUIRED) -# For the web interface -pkg_check_modules(PQ libpq REQUIRED IMPORTED_TARGET) -pkg_check_modules(PQXX libpqxx>=7.2 REQUIRED IMPORTED_TARGET) +find_package(libpqxx 7.8 REQUIRED) + pkg_check_modules(SSL libssl IMPORTED_TARGET) pkg_check_modules(CRYPTO libcrypto IMPORTED_TARGET) @@ -176,10 +175,8 @@ target_link_libraries(alphafill libmcfp::libmcfp cifpp::cifpp zeep::zeep - PkgConfig::PQXX - PkgConfig::PQ - PkgConfig::SSL - PkgConfig::CRYPTO + libpqxx::pqxx + PkgConfig::SSL PkgConfig::CRYPTO std::filesystem) if(USE_RSRC) diff --git a/src/alphafill.cpp b/src/alphafill.cpp index f65adec..268a58c 100644 --- a/src/alphafill.cpp +++ b/src/alphafill.cpp @@ -978,7 +978,7 @@ zeep::json::element alphafill(cif::datablock &db, const std::vector { "pdbx_ordinal", software.size() + 1 }, // TODO: should we check this ordinal number??? { "name", "alphafill" }, { "version", kVersionNumber }, - { "date", kBuildDate }, + { "date", kRevisionDate }, { "classification", "model annotation" } }); return result;