Fix building with new version string code and new libpqxx

PDB-REDO · Aug 15, 2023 · 7f508b4 · 7f508b4
1 parent f340e46
commit 7f508b4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git 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
@@ -978,7 +978,7 @@ zeep::json::element alphafill(cif::datablock &db, const std::vector<PAE_matrix>
 		{ "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;