Skip to content

Commit

Permalink
Change: Drop the feed version subdirectory from GVMD_FEED_DIR
Browse files Browse the repository at this point in the history
  • Loading branch information
a-h-abdelsalam committed Feb 6, 2025
1 parent 99b08c2 commit 081e5bd
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
3 changes: 1 addition & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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}")
Expand Down Expand Up @@ -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)
Expand Down
3 changes: 0 additions & 3 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down

0 comments on commit 081e5bd

Please sign in to comment.