Skip to content

Commit

Permalink
CMake Project Rename : Update install rules (#13)
Browse files Browse the repository at this point in the history
* Flexibly install ignition or gz

Signed-off-by: methylDragon <methylDragon@gmail.com>

* Use wildcard to enable flexible installs

Signed-off-by: methylDragon <methylDragon@gmail.com>

* Update release tests

Signed-off-by: methylDragon <methylDragon@gmail.com>

* Narrow install rule for share dirs and remove redundant gz rules

Signed-off-by: methylDragon <methylDragon@gmail.com>
  • Loading branch information
methylDragon authored Jun 25, 2022
1 parent 227b6df commit 3000403
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions ubuntu/debian/libignition-math-dev.install
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
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
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 <jrivero@osrfoundation.org>
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`
echo "build: OK"
[ -x igntest ]
./igntest
[ -x gztest ]
./gztest
echo "run: OK"

0 comments on commit 3000403

Please sign in to comment.