diff options
| author |   Jordan Augé <jordan.auge+fdio@cisco.com> | 2019-10-25 12:46:38 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2019-10-25 12:46:38 +0000 |
| commit | 12439a0131fa2c10d52a190fbb44ca54d0d3dc6e (patch) | |
| tree | f57c07b9cf80a4faa803f432ed97fbb0b4c9adb7 /cmake/Modules | |
| parent | 8103b2103a1405b0c2344abc956e10535f7012b3 (diff) | |
| parent | baaeb1af53ab4c64b31786bddfd7573445f21342 (diff) | |
Merge "[HICN-358] Enable systemctl service after package installation."
Diffstat (limited to 'cmake/Modules')
| -rw-r--r-- | cmake/Modules/Packager.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cmake/Modules/Packager.cmake b/cmake/Modules/Packager.cmake index 6f77fd3a8..e5e3fa731 100644 --- a/cmake/Modules/Packager.cmake +++ b/cmake/Modules/Packager.cmake @@ -136,7 +136,7 @@ macro(make_packages) set(CPACK_${type}_${uc}_PACKAGE_NAME "${lc}") set(CPACK_COMPONENT_${uc}_DESCRIPTION "${${lc}_DESCRIPTION}") - if (NOT ${${lc}_DEB_PACKAGE_CONTROL_EXTRA} STREQUAL "") + if (${lc}_DEB_PACKAGE_CONTROL_EXTRA) set(CPACK_DEBIAN_${uc}_PACKAGE_CONTROL_EXTRA "${${lc}_DEB_PACKAGE_CONTROL_EXTRA}") endif() endforeach() @@ -183,6 +183,10 @@ macro(make_packages) if (NOT ${${lc}_RPM_POST_UNINSTALL_SCRIPT_FILE} STREQUAL "") set(CPACK_RPM_${uc}_POST_UNINSTALL_SCRIPT_FILE "${${lc}_RPM_POST_UNINSTALL_SCRIPT_FILE}") endif() + + if (NOT ${${lc}_RPM_PRE_UNINSTALL_SCRIPT_FILE} STREQUAL "") + set(CPACK_RPM_${uc}_PRE_UNINSTALL_SCRIPT_FILE "${${lc}_RPM_PRE_UNINSTALL_SCRIPT_FILE}") + endif() endforeach() endif() |