Skip to content

Commit

Permalink
CMake Project Rename : Update install rules (#8)
Browse files Browse the repository at this point in the history
  • Loading branch information
methylDragon authored Jun 25, 2022
1 parent 99c988d commit 0511b79
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 20 deletions.
6 changes: 3 additions & 3 deletions ubuntu/debian/libignition-fuel-tools8-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-*/*
usr/share/ignition/fuel[0-99].yaml
usr/share/ignition/ignition-fuel_tools[0-99]/ignition-fuel_tools*.tag.xml
usr/lib/*/cmake/*-*/*
usr/share/*/fuel[0-99].yaml
usr/share/ignition/*-fuel_tools[0-99]/*-fuel_tools*.tag.xml
2 changes: 1 addition & 1 deletion ubuntu/debian/libignition-fuel-tools8.install
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
usr/lib/*/*.so.*
usr/lib/*/*/*.rb
usr/share/*/*/*.yaml
usr/share/ignition/*/*.yaml
32 changes: 16 additions & 16 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-common, to verify that the
# autopkgtest check: Build and run a program against gz-common, 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.cc
cat <<EOF > gztest.cc
#include <gflags/gflags.h>
#include <iostream>
#include <gz/fuel_tools.hh>
Expand All @@ -27,7 +27,7 @@ int main(int argc, char **argv)
{
// Simple usage.
std::string usage("Show details of a resource.");
usage += " Usage:\n ./igntest <options>\n\n";
usage += " Usage:\n ./gztest <options>\n\n";
usage += " Example:\n"
"\t ./details -t model -o OpenRobotics -n Beer"
"\t ./details -t world -s https://localhost:4430 -o OpenRobotics -n Empty"
Expand Down Expand Up @@ -127,42 +127,42 @@ EOF
cat <<EOF > CMakeLists.txt
cmake_minimum_required(VERSION 3.5)
project(ign_test VERSION 1.0.0)
project(gz_test VERSION 1.0.0)
find_package(gflags REQUIRED)
find_package(ignition-fuel_tools7 7.0.0 REQUIRED)
find_package(gz-fuel_tools7 7.0.0 REQUIRED)
include_directories(\${IGNITION-FUEL_TOOLS_INCLUDE_DIRS})
include_directories(\${IGNITION-COMMON_INCLUDE_DIRS})
add_executable(igntest igntest.cc)
target_link_libraries(igntest \${ignition-fuel_tools7_LIBRARIES} gflags)
add_executable(gztest gztest.cc)
target_link_libraries(gztest \${gz-fuel_tools7_LIBRARIES} gflags)
EOF

cmake .
echo "configure cmake: OK"
VERBOSE=1 make
echo "build cmake:OK"
[ -x igntest ]
./igntest --help
[ -x gztest ]
./gztest --help
echo "run: OK"

cat <<EOF > CMakeLists.txt
cmake_minimum_required(VERSION 3.5)
project(ign_test VERSION 1.0.0)
project(gz_test VERSION 1.0.0)
find_package(gflags REQUIRED)
find_package(ignition-fuel_tools7 7.0.0 REQUIRED)
add_executable(igntest igntest.cc)
target_link_libraries(igntest
find_package(gz-fuel_tools7 7.0.0 REQUIRED)
add_executable(gztest gztest.cc)
target_link_libraries(gztest
PUBLIC
gflags
ignition-fuel_tools7::ignition-fuel_tools7)
gz-fuel_tools7::gz-fuel_tools7)
EOF

cmake .
echo "configure cmake with component: OK"
make
echo "build cmake component:OK"
[ -x igntest ]
./igntest --help
[ -x gztest ]
./gztest --help
echo "run: OK"

0 comments on commit 0511b79

Please sign in to comment.