From 1141d450f9b5bd4f9e9cf8013e75b8d6aa17515b Mon Sep 17 00:00:00 2001 From: Ahmed Abdelsalam Date: Thu, 6 Feb 2025 13:02:53 +0100 Subject: [PATCH] Change: Drop the feed version subdirectory from GVMD_FEED_DIR --- CMakeLists.txt | 3 +-- src/CMakeLists.txt | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 456002fb2..f64a6be6e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -103,7 +103,6 @@ set (GVMD_SCAP_DATABASE_VERSION 22) set (GVMD_CERT_DATABASE_VERSION 8) set (GMP_VERSION "22.6") -set (GMP_VERSION_FEED "24.10") if (SYSCONF_INSTALL_DIR) set (SYSCONFDIR "${SYSCONF_INSTALL_DIR}") @@ -212,7 +211,7 @@ if (NOT DATA_OBJECTS_FEED_DIR) endif (NOT DATA_OBJECTS_FEED_DIR) if (NOT GVMD_FEED_DIR) - set (GVMD_FEED_DIR "${DATA_OBJECTS_FEED_DIR}/gvmd/${GMP_VERSION_FEED}") + set (GVMD_FEED_DIR "${DATA_OBJECTS_FEED_DIR}/gvmd") endif (NOT GVMD_FEED_DIR) if (NOT GVM_ACCESS_KEY_DIR) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c5703e269..d324b4127 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -386,9 +386,6 @@ endif (NOT CMAKE_BUILD_TYPE MATCHES "Release") if (GMP_VERSION) add_definitions (-DGMP_VERSION="${GMP_VERSION}") endif (GMP_VERSION) -if (GMP_VERSION_FEED) - add_definitions (-DGMP_VERSION_FEED="${GMP_VERSION_FEED}") -endif (GMP_VERSION_FEED) add_definitions (-DGVMD_DATABASE_VERSION=${GVMD_DATABASE_VERSION}) add_definitions (-DGVMD_SCAP_DATABASE_VERSION=${GVMD_SCAP_DATABASE_VERSION})