Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/rpm-software-management/createrepo_c.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeal Gompa <ngompa13@gmail.com>2019-07-31 16:42:34 +0300
committerNeal Gompa (ニール・ゴンパ) <ngompa13@gmail.com>2019-08-06 14:26:13 +0300
commit4e239193992ec1c866b6c7b50b4e9d08e70621f1 (patch)
treecd8c69a1c7379efdae4e453a21b23e64012b4375 /CMakeLists.txt
parentd65f9bcd2fabd55e813d0b4eb5e90eb19ee9a002 (diff)
Revise drpm dependency check and bump the minimum version to 0.3.0
Since we now use the functionality from drpm to create DeltaRPMs, we need to update the dependency check accordingly. Also, drpm has long since ceased to be an experimental dependency, so stop marking it as such. Finally, update the README with the correct information about DeltaRPM support.
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt21
1 files changed, 3 insertions, 18 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6b5adff..58ecfae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -89,24 +89,9 @@ ENDIF (ENABLE_LEGACY_WEAKDEPS)
# drpm
OPTION (ENABLE_DRPM "Enable delta RPM support?" ON)
IF (ENABLE_DRPM)
- if (DRPM_PATH)
- include_directories (${DRPM_PATH}/)
- find_library (DRPM_LIBRARY NAMES drpm PATHS ${DRPM_PATH}/ NO_DEFAULT_PATH)
- set(CR_DELTA_RPM_SUPPORT "1")
- message("Using custom DRPM: ${DRPM_LIBRARY}")
- ELSE (DRPM_PATH)
- FIND_LIBRARY (DRPM_LIBRARY NAMES drpm libdrpm.so.0)
- IF (NOT DRPM_LIBRARY)
- MESSAGE("No DRPM library installed")
- ELSE (NOT DRPM_LIBRARY)
- MESSAGE("Using DRPM library: ${DRPM_LIBRARY}")
- set(CR_DELTA_RPM_SUPPORT "1")
- ENDIF (NOT DRPM_LIBRARY)
- endif (DRPM_PATH)
-
- IF (CR_DELTA_RPM_SUPPORT)
- ADD_DEFINITIONS("-DCR_DELTA_RPM_SUPPORT")
- ENDIF (CR_DELTA_RPM_SUPPORT)
+ pkg_check_modules(DRPM REQUIRED drpm>=0.3.0)
+ include_directories (${DRPM_INCLUDE_DIRS})
+ ADD_DEFINITIONS("-DCR_DELTA_RPM_SUPPORT")
ENDIF (ENABLE_DRPM)
# option to enable/disable python support