Skip to content

Commit

Permalink
fix deb pkgs for individual modules
Browse files Browse the repository at this point in the history
  • Loading branch information
jlblancoc committed Jul 29, 2018
1 parent ba0280e commit 24201e0
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 4 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -604,7 +604,7 @@ IF(CMAKE_MRPT_USE_DEB_POSTFIXS)
SET(mrpt_pkgconfig_INSTALL_PREFIX "/usr")
ELSE()
# Values under normal conditions -----------------------
SET(libmrpt_xxx_dev_INSTALL_PREFIX "")
SET(libmrpt_common_dev_INSTALL_PREFIX "")
SET(libmrpt_dev_INSTALL_PREFIX "")
SET(mrpt_apps_INSTALL_PREFIX "")
SET(mrpt_doc_INSTALL_PREFIX "")
Expand Down
8 changes: 7 additions & 1 deletion cmakemodules/DeclareMRPTLib.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -382,8 +382,14 @@ macro(internal_define_mrpt_lib name headers_only is_metalib)
SET(mrpt_pkgconfig_NO_INSTALL_BINARY "${MRPT_BINARY_DIR}")
CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/parse-files/mrpt_template_no_install.pc.in" "${CMAKE_BINARY_DIR}/pkgconfig-no-install/mrpt-${name}.pc" @ONLY)


if (CMAKE_MRPT_USE_DEB_POSTFIXS)
set(this_lib_dev_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/libmrpt-${name}-dev/usr/")
else()
set(this_lib_dev_INSTALL_PREFIX "")
endif()

IF (NOT IS_DEBIAN_DBG_PKG)
STRING(REPLACE "xxx" "${name}" this_lib_dev_INSTALL_PREFIX "${libmrpt_xxx_dev_INSTALL_PREFIX}")
# .pc file:
INSTALL(
FILES "${CMAKE_BINARY_DIR}/pkgconfig/mrpt-${name}.pc"
Expand Down
4 changes: 2 additions & 2 deletions packaging/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ endif
# traces on failure:
MRPT_TEST_TARGET = test_legacy

-DCMAKE_INSTALL_PREFIX="$(CURDIR)/debian/" \
CMAKE_FLAGS = \
-DCMAKE_INSTALL_PREFIX="$(CURDIR)/debian/" \
-DCMAKE_INSTALL_LIBDIR="lib/$(DEB_HOST_MULTIARCH)" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_BUILD_TYPE=Release \
Expand Down Expand Up @@ -78,7 +78,7 @@ override_dh_install:
dh_auto_build -O--buildsystem=cmake -- install

# Move all the ".so" files to the proper place: the -dev package:
find $(CURDIR)/debian/ -name "*.so" | grep -v 'dev' | while read line; do f=$(basename $line .so); echo "Processing so file: $line, basename: $f"; mkdir -p $(CURDIR)/debian/$f-dev/usr/lib/$(DEB_HOST_MULTIARCH); mv -f $line $(CURDIR)/debian/$f-dev/usr/lib/$(DEB_HOST_MULTIARCH); done
find $(CURDIR)/debian/ -name "*.so" | grep -v 'dev' | while read line; do f=$$(basename $$line .so); echo "Processing so file: $$line, basename: $f"; mkdir -p $(CURDIR)/debian/$$f-dev/usr/lib/$(DEB_HOST_MULTIARCH); mv -f $$line $(CURDIR)/debian/$$f-dev/usr/lib/$(DEB_HOST_MULTIARCH); done

# Fix Doxygen's embedded JQuery lib:
rm $(CURDIR)/debian/mrpt-doc/usr/share/doc/mrpt-doc/html/jquery.js || true
Expand Down

0 comments on commit 24201e0

Please sign in to comment.