Skip to content

Commit 953066e

Browse files
committed
cmake/LinuxPackaging: bundle gtkdatabox 1.0.0
Bundle GtkDataBox version 1.0.0 with the installable. All dependencies from this library are available in Ubuntu 20.04, just it is not. When we eventually drop support to Ubuntu 20.04, we stop bundling it. The package size increases 142kB due to this. Signed-off-by: Jorge Marques <[email protected]>
1 parent 5080293 commit 953066e

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

CMakeLists.txt

+9
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,15 @@ install(TARGETS osc
259259
)
260260
install(TARGETS oscmain RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
261261

262+
# Ubuntu 20.04 does not have GtkDataBox 1.0.0,
263+
# until we drop support, bundle it.
264+
if(ENABLE_PACKAGING)
265+
install(
266+
FILES "${GTKDATABOX_LIBDIR}/libgtkdatabox.so.1.0.0"
267+
DESTINATION ${CMAKE_INSTALL_LIBDIR}
268+
RENAME libgtkdatabox.so.1
269+
)
270+
endif()
262271
# Set default CMAKE_PREFIX_PATH to CMAKE_SYSTEM_PREFIX_PATH
263272
set(CMAKE_PREFIX_PATH ${CMAKE_SYSTEM_PREFIX_PATH})
264273

cmake/LinuxPackaging.cmake

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ FIND_PROGRAM(RPMBUILD_CMD rpmbuild)
66
if (RPMBUILD_CMD)
77
set(CPACK_PACKAGE_RELOCATABLE OFF)
88
set(CPACK_GENERATOR ${CPACK_GENERATOR};RPM)
9-
set(CPACK_RPM_PACKAGE_REQUIRES "libiio >= 0.19, gtk3 >= 3.24, libgtkdatabox >= 1.0.0, libjansson > 2.12, libmatio >= 1.5.17")
9+
set(CPACK_RPM_PACKAGE_REQUIRES "libiio >= 0.19, gtk3 >= 3.24, libjansson > 2.12, libmatio >= 1.5.17")
1010
endif()
1111

1212
set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 0)
@@ -33,7 +33,7 @@ if(DEB_DETECT_DEPENDENCIES AND DPKG_CMD AND DPKGQ_CMD)
3333
execute_process(COMMAND "${DPKG_CMD}" --print-architecture
3434
OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE
3535
OUTPUT_STRIP_TRAILING_WHITESPACE)
36-
set(PACKAGES "libiio libgtk-3 libgtkdatabox libjansson libmatio")
36+
set(PACKAGES "libiio libgtk-3 libjansson libmatio")
3737
# find the version of the installed package, which is hard to do in
3838
# cmake first, turn the list into an list (seperated by semicolons)
3939
string(REGEX REPLACE " " ";" PACKAGES ${PACKAGES})
@@ -86,7 +86,7 @@ if(DEB_DETECT_DEPENDENCIES AND DPKG_CMD AND DPKGQ_CMD)
8686
${CPACK_DEBIAN_PACKAGE_DEPENDS})
8787
else()
8888
# assume everything is turned on, and running on a modern OS
89-
set(CPACK_DEBIAN_PACKAGE_DEPENDS "libiio0 (>= 0.19), libgtk-3-0 (>= 3.24.18), libgtkdatabox (>= 1.0.0), libjansson4 (> 2.12), libmatio11 (>= 1.5.17)")
89+
set(CPACK_DEBIAN_PACKAGE_DEPENDS "libiio0 (>= 0.19), libgtk-3-0 (>= 3.24.18), libjansson4 (> 2.12), libmatio11 (>= 1.5.17)")
9090
message(STATUS "Using default dependencies for packaging")
9191
endif()
9292

0 commit comments

Comments
 (0)