Skip to content

Commit

Permalink
Run builds on the new Xenial environment
Browse files Browse the repository at this point in the history
  • Loading branch information
PeterBowman committed Apr 20, 2019
1 parent e901f1e commit 9b2b39b
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
5 changes: 4 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
language: cpp
dist: trusty
dist: xenial
os: linux

compiler:
Expand Down Expand Up @@ -32,6 +32,8 @@ addons:
apt:
packages:
- libopencv-dev
- libpcl-dev
- libproj-dev # needed by libpcl-dev on Xenial (known bug)

# ECF
- libboost-dev
Expand Down Expand Up @@ -92,6 +94,7 @@ install:
--repo-checkout master
--additional-cmake-options "-DOPT_VIDEORECORDING:BOOL=OFF"
--prepend-to-linker-path lib
--cmake-env 'CFLAGS="-w" CXXFLAGS="-w"'
#-- Install KDL
- >
Expand Down
5 changes: 4 additions & 1 deletion programs/depthToMesh/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ project(${KEYWORD})
#find_package(YARP REQUIRED)
find_package(PCL 1.2 REQUIRED)

# Xenial + PCL 1.7 bug
# https://github.com/PointCloudLibrary/pcl/issues/2406
list(REMOVE_ITEM PCL_LIBRARIES "vtkproj4")

# Search for source code.
file(GLOB folder_source *.cpp *.cc *.c)
file(GLOB folder_header *.h)
Expand All @@ -23,7 +27,6 @@ foreach(header_file ${folder_header})
endforeach(header_file ${folder_header})

#include_directories(${YARP_INCLUDE_DIRS})
find_package(PCL 1.2 REQUIRED)
include_directories(${PCL_INCLUDE_DIRS})

link_directories(${PCL_LIBRARY_DIRS})
Expand Down
6 changes: 4 additions & 2 deletions scripts/travis/git-cache-dependency.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ additional_cmake_options=
prepend_to_linker_path=
prepend_to_standard_path=
additional_export_paths=
cmake_env=

#-- Available getopt long option names
#-- https://gist.github.com/magnetikonline/22c1eb412daa350eeceee76c97519da8
Expand All @@ -25,6 +26,7 @@ ARGUMENT_LIST=(
"prepend-to-linker-path"
"prepend-to-standard-path"
"additional-export-paths"
"cmake-env"
)

#-- Read arguments
Expand Down Expand Up @@ -91,7 +93,7 @@ if $is_clone_only_branch; then
then
echo "$package_name not in cache or not the latest commit of $repo_checkout branch"
rm -rf "$repo_cache_dir"/*
cmake -H"$cmake_home_dir" -B"$repo_build_dir" $repo_cmake_options
eval $cmake_env cmake -H"$cmake_home_dir" -B"$repo_build_dir" $repo_cmake_options
make -C "$repo_build_dir" -j$(nproc) install
echo "$last_commit_sha" > "$repo_cache_dir/.last_commit_sha"
else
Expand All @@ -106,7 +108,7 @@ else
echo "Downloading $package_name $repo_checkout from archive"
wget -q "$repo_url/archive/$repo_checkout.tar.gz" -P "$repo_source_dir"
tar xzf "$repo_source_dir/$repo_checkout.tar.gz" -C "$repo_source_dir" --strip-components=1
cmake -H"$cmake_home_dir" -B"$repo_build_dir" $repo_cmake_options
eval $cmake_env cmake -H"$cmake_home_dir" -B"$repo_build_dir" $repo_cmake_options
make -C "$repo_build_dir" -j$(nproc) install
else
echo "$package_name $repo_checkout already in cache"
Expand Down

0 comments on commit 9b2b39b

Please sign in to comment.