summaryrefslogtreecommitdiffstats
path: root/extras
diff options
context:
space:
mode:
authorMauro Sardara <msardara@cisco.com>2020-11-06 12:42:46 +0100
committerMauro Sardara <msardara@cisco.com>2020-11-06 17:15:30 +0100
commit7f2bbf5f6934be58c016f0159e497fa519d14372 (patch)
tree0d6469b1a4089756dba08b8a76d109dd120095fe /extras
parentda2c11cfd77383f37dd01e67efb5c44dece9c3a9 (diff)
[HICN-653] Cleanup build scripts.
Main changes: - Next VPP version is now counted 4 months (instead of 3) from the current one - CMake will now use Ninja as generator - Build functions are gathered under build/functions.sh and they are shared instead of being duplicated in build-extras and build-packages - Various bug fixes for dependencies and versioning. Signed-off-by: Mauro Sardara <msardara@cisco.com> Change-Id: I3f482d2c87847a465019dd0992ee9375c88bb412 Signed-off-by: Mauro Sardara <msardara@cisco.com>
Diffstat (limited to 'extras')
-rw-r--r--extras/libmemif/CMakeLists.txt3
-rw-r--r--extras/libmemif/cmake/Modules/Packaging.cmake12
2 files changed, 7 insertions, 8 deletions
diff --git a/extras/libmemif/CMakeLists.txt b/extras/libmemif/CMakeLists.txt
index 5ac2b7e1b..11c87fe12 100644
--- a/extras/libmemif/CMakeLists.txt
+++ b/extras/libmemif/CMakeLists.txt
@@ -34,8 +34,7 @@ ExternalProject_Add(libmemif
LIST_SEPARATOR |
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_MODULE_PATH=${MODULE_PATH}
SOURCE_SUBDIR ./extras/libmemif
- BUILD_COMMAND make package
- INSTALL_COMMAND make DESTDIR=${DESTDIR} install
+ BUILD_COMMAND ${CMAKE_COMMAND} --build . -- package
)
if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
diff --git a/extras/libmemif/cmake/Modules/Packaging.cmake b/extras/libmemif/cmake/Modules/Packaging.cmake
index 50f820589..7f6d53ceb 100644
--- a/extras/libmemif/cmake/Modules/Packaging.cmake
+++ b/extras/libmemif/cmake/Modules/Packaging.cmake
@@ -15,30 +15,30 @@
# Packages section
######################
-set(${LIBMEMIF}_DESCRIPTION
+set(lib${LIBMEMIF}_DESCRIPTION
"Libmemif, shared memory interface"
CACHE STRING "Description for deb/rpm package."
)
-set(${LIBMEMIF}_DEB_DEPENDENCIES
+set(lib${LIBMEMIF}_DEB_DEPENDENCIES
"" CACHE STRING "Dependencies for deb/rpm package."
)
-set(${LIBMEMIF}_RPM_DEPENDENCIES
+set(lib${LIBMEMIF}_RPM_DEPENDENCIES
"" CACHE STRING "Dependencies for deb/rpm package."
)
-set(${LIBMEMIF}-dev_DESCRIPTION
+set(lib${LIBMEMIF}-dev_DESCRIPTION
"Libmemif, shared memory interface header files"
CACHE STRING "Description for deb/rpm package."
)
-set(${LIBMEMIF}-dev_DEB_DEPENDENCIES
+set(lib${LIBMEMIF}-dev_DEB_DEPENDENCIES
"libmemif (>= stable_version)"
CACHE STRING "Dependencies for deb/rpm package."
)
-set(${LIBMEMIF}-dev_RPM_DEPENDENCIES
+set(lib${LIBMEMIF}-dev_RPM_DEPENDENCIES
"libmemif (>= stable_version)"
CACHE STRING "Dependencies for deb/rpm package."
)