summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Sardara <msardara@cisco.com>2020-02-18 13:08:30 +0100
committerMauro Sardara <msardara@cisco.com>2020-02-18 12:28:58 +0000
commitfbe679d3c25a69ab6b238ebe896ba83e3c8ac6e4 (patch)
tree38dca9cbc5f73a05011b6cb83ad18147b471adbe
parente539441a59c53f790f273eb6f0df79b38a2776fb (diff)
[HICN-527] Do not create Unspecified DEB/RPM package anymore.
Change-Id: Id79b3885ca02b24a4c480ec10a0b2a1330ff8604 Signed-off-by: Mauro Sardara <msardara@cisco.com>
-rw-r--r--.gitignore2
-rw-r--r--cmake/Modules/BuildMacros.cmake2
-rw-r--r--cmake/Modules/Packager.cmake3
-rw-r--r--scripts/build-packages.sh2
4 files changed, 5 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index 378eac25d..1b2211df0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-build
+build*
diff --git a/cmake/Modules/BuildMacros.cmake b/cmake/Modules/BuildMacros.cmake
index ed767dbcc..c4c6c9af1 100644
--- a/cmake/Modules/BuildMacros.cmake
+++ b/cmake/Modules/BuildMacros.cmake
@@ -153,10 +153,10 @@ macro(build_library lib)
install(
TARGETS ${library}
+ COMPONENT ${ARG_COMPONENT}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
LIBRARY DESTINATION ${INSTALL_LIB_PATH}
- COMPONENT ${ARG_COMPONENT}
)
if(ARG_DEPENDS)
diff --git a/cmake/Modules/Packager.cmake b/cmake/Modules/Packager.cmake
index 5e77d7de0..1edfd671d 100644
--- a/cmake/Modules/Packager.cmake
+++ b/cmake/Modules/Packager.cmake
@@ -106,7 +106,8 @@ macro(make_packages)
get_next_version(${tag} next_version)
get_cmake_property(components COMPONENTS)
- get_cmake_property(CPACK_COMPONENTS_ALL COMPONENTS)
+ list(REMOVE_ITEM components "Unspecified")
+ set(CPACK_COMPONENTS_ALL ${components})
if(OS_ID MATCHES "debian" OR OS_ID_LIKE MATCHES "debian")
set(CPACK_GENERATOR "DEB")
diff --git a/scripts/build-packages.sh b/scripts/build-packages.sh
index 76e76a385..216099f3c 100644
--- a/scripts/build-packages.sh
+++ b/scripts/build-packages.sh
@@ -208,7 +208,7 @@ build_package() {
make VERBOSE=1 -j8 package
find . -not -name '*.deb' -not -name '*.rpm' -print0 | xargs -0 rm -rf -- || true
- rm *Unspecified*
+ rm *Unspecified* || true
popd