Emmanuel Promayon pushed to branch upstream-ci/master at Debian Med / camitk
Commits:
46419dbf by Emmanuel Promayon at 2020-07-07T08:29:33+02:00
add required LD_LIBRARY_PATH during test
- - - - -
1 changed file:
- debian/rules
Changes:
=====================================
debian/rules
=====================================
@@ -71,6 +71,11 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
# Note: all tests require an X server, xvfb-run is needed to have a
virtual one
# Another way: xvfb-run --auto-servernum $(MAKE) -C camitk-build
ARGS="-V" test
# e.g. to test config: (cd camitk-build && xvfb-run --auto-servernum
--server-args="-screen 0 1024x768x24" ctest -VV --timeout 1800 -R
application-config)
+ # The build dir path is needed for extensions, public and private
libraries during test
+ # to know about all camitk extension directories and properly manage
inner-dependencies
+ # between extensions (i.e., mml component extension depends on
physicalmodel component extensions)
+ # Lib dependencies can be in any extensions (viewers, component and
action extensions) lib directory
+ export
LD_LIBRARY_PATH=$(LIB_BUILD_DIR)/:$(PRIVATE_LIB_BUILD_DIR)/viewers/:$(PRIVATE_LIB_BUILD_DIR)/components/:$(PRIVATE_LIB_BUILD_DIR)/actions/:$(PRIVATE_LIB_BUILD_DIR)/
; \
(cd camitk-build && xvfb-run --auto-servernum --server-args="-screen 0
1024x768x24" ctest -V --timeout 1800)
endif
@@ -158,12 +163,9 @@ override_dh_install:
# dpkg-shlibdeps needs to know about camitk extension directories to manage
inner-dependencies
# between extensions (i.e., mml component extension depends on physicalmodel
component extensions)
-# Lib dependencies can be in
-# - any extensions (viewers, component and action extensions)
-# - any private libraries:
-# during test, the build dir path is also needed (for extensions, public and
private libraries)
+# Lib dependencies can be in any extensions lib directory (viewers, component
and action extensions)
override_dh_shlibdeps:
- dh_shlibdeps
-l$(PKG_LIB_DIR)/viewers/:$(PKG_LIB_DIR)/components/:$(PKG_LIB_DIR)/actions/:$(PKG_LIB_DIR)/:$(LIB_BUILD_DIR)/:$(PRIVATE_LIB_BUILD_DIR)/viewers/:$(PRIVATE_LIB_BUILD_DIR)/components/:$(PRIVATE_LIB_BUILD_DIR)/actions/:$(PRIVATE_LIB_BUILD_DIR)/
+ dh_shlibdeps
-l$(PKG_LIB_DIR)/viewers/:$(PKG_LIB_DIR)/components/:$(PKG_LIB_DIR)/actions/:$(PKG_LIB_DIR)/
# see http://lists.debian.org/debian-mentors/2012/07/msg00124.html
get-orig-source:
View it on GitLab:
https://salsa.debian.org/med-team/camitk/-/commit/46419dbf7ed1dd563d459295750e5393cbb3d963
--
View it on GitLab:
https://salsa.debian.org/med-team/camitk/-/commit/46419dbf7ed1dd563d459295750e5393cbb3d963
You're receiving this email because of your account on salsa.debian.org.
_______________________________________________
debian-med-commit mailing list
[email protected]
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
