Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CMake Project Rename : Update install rules #13

Merged
merged 4 commits into from
Jun 25, 2022
Merged

CMake Project Rename : Update install rules #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1889dca
Flexibly install ignition or gz
methylDragon Jun 20, 2022
282db40
Use wildcard to enable flexible installs
methylDragon Jun 21, 2022
50b8182
Update release tests
methylDragon Jun 21, 2022
56183d9
Narrow install rule for share dirs and remove redundant gz rules
methylDragon Jun 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ubuntu/debian/libignition-math-dev.install
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
usr/include/*
usr/lib/*/*.so
usr/lib/*/pkgconfig/*.pc
usr/lib/*/cmake/ignition-math[0-99]/*
usr/lib/*/cmake/ignition-math[0-99]-all/*
usr/lib/*/cmake/*-math[0-99]/*
usr/lib/*/cmake/*-math[0-99]-all/*
usr/share/ignition/*/*
8 changes: 4 additions & 4 deletions ubuntu/debian/libignition-math-eigen3-dev.install
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
usr/include/ignition/*/ignition/math/eigen3/*
usr/include/ignition/*/ignition/math/eigen3.hh
usr/lib/*/pkgconfig/ignition-math?-eigen3.pc
usr/lib/*/cmake/ignition-math?-eigen3/*
usr/include/*/*/*/math/eigen3/*
usr/include/*/*/*/math/eigen3.hh
usr/lib/*/pkgconfig/*-math?-eigen3.pc
usr/lib/*/cmake/*-math?-eigen3/*
10 changes: 5 additions & 5 deletions ubuntu/debian/tests/build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/sh
# autopkgtest check: Build and run a program against ign-math, to verify that the
# autopkgtest check: Build and run a program against gz-math, to verify that the
# headers and pkg-config file are installed correctly
# (C) 2012 Jose Luis Rivero
# Author: Jose Luis Rivero <[email protected]>
Expand All @@ -9,7 +9,7 @@ set -e
WORKDIR=$(mktemp -d)
trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM
cd $WORKDIR
cat <<EOF > igntest.c
cat <<EOF > gztest.c

#include <iostream>
#include <gz/math.hh>
Expand Down Expand Up @@ -76,8 +76,8 @@ int main(int argc, char **argv)
}
EOF

g++ -o igntest igntest.c `pkg-config --cflags --libs ignition-math7`
g++ -o gztest gztest.c `pkg-config --cflags --libs gz-math7`
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe this line requires gazebosim/gz-math#420 to be merged first

echo "build: OK"
[ -x igntest ]
./igntest
[ -x gztest ]
./gztest
echo "run: OK"