[shark] 03/03: Fix build of examples in autopkgtest testsuite.
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Thu Feb 18 19:21:33 UTC 2016
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch debian/sid
in repository shark.
commit 1d48630dbec90fc28fd12a951438e3c6c472f806
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date: Tue Feb 16 10:17:10 2016 +0000
Fix build of examples in autopkgtest testsuite.
---
debian/tests/build-examples | 17 ++++++++++++++---
debian/tests/control | 7 +++++++
2 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/debian/tests/build-examples b/debian/tests/build-examples
index a90e942..900caa6 100755
--- a/debian/tests/build-examples
+++ b/debian/tests/build-examples
@@ -25,15 +25,26 @@ project(dummy)
find_package(Shark REQUIRED)
include(\${SHARK_USE_FILE})
-find_package(Boost REQUIRED)
+set(Boost_COMPONENTS date_time filesystem program_options system thread
+ unit_test_framework)
+find_package(Boost COMPONENTS \${Boost_COMPONENTS} REQUIRED)
include_directories(\${Boost_INCLUDE_DIRS})
+find_package(PkgConfig)
+pkg_check_modules(PC_BLAS blas)
+include_directories(\${PC_BLAS_INCLUDE_DIRS})
+link_directories(\${PC_BLAS_LIBRARY_DIRS})
+
+find_package(HDF5 COMPONENTS C CXX HL REQUIRED)
+include_directories(\${HDF5_INCLUDE_DIRS})
+link_directories(\${HDF5_LIBRARY_DIRS})
+
file(GLOB_RECURSE EXAMPLE_FILES \${CMAKE_CURRENT_SOURCE_DIR} "*.cpp")
foreach(FILE \${EXAMPLE_FILES})
get_filename_component(TARGET_NAME \${FILE} NAME_WE)
add_executable(\${TARGET_NAME} \${FILE})
target_link_libraries(\${TARGET_NAME} \${SHARK_LIBRARIES}
- \${Boost_LIBRARIES})
+ \${Boost_LIBRARIES} \${PC_BLAS_LIBRARIES} \${HDF5_LIBRARIES})
endforeach()
EOF
@@ -43,5 +54,5 @@ mkdir build
cd build
cmake ./..
echo "configure: OK"
-make -j$(nproc)
+make VERBOSE=1 -j$(nproc)
echo "build: OK"
diff --git a/debian/tests/control b/debian/tests/control
index 19f5983..26c680a 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,5 +1,12 @@
Tests: build-examples
Depends: build-essential,
cmake,
+ libboost-date-time-dev,
+ libboost-filesystem-dev,
+ libboost-program-options-dev,
+ libboost-system-dev,
+ libboost-test-dev,
+ libboost-thread-dev,
libshark-dev,
+ pkg-config,
shark-doc
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/shark.git
More information about the debian-science-commits
mailing list