Skip to content

Commit

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

Signed-off-by: methylDragon <[email protected]>

* Use wildcard to enable flexible installs

Signed-off-by: methylDragon <[email protected]>

* Update release tests

Signed-off-by: methylDragon <[email protected]>
  • Loading branch information
methylDragon authored Jun 22, 2022
1 parent 6b13a05 commit 8174ba2
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 14 deletions.
2 changes: 1 addition & 1 deletion ubuntu/debian/ignition-plugin-cli.install
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# Needs to be migrated to libexec
usr/libexec/ignition/
usr/libexec/*/
8 changes: 4 additions & 4 deletions ubuntu/debian/libignition-plugin-dev.install
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
usr/include/*
usr/lib/*/*.so
usr/lib/*/pkgconfig/*.pc
usr/lib/*/cmake/ignition-plugin*/*
usr/lib/ruby/ignition/*
usr/share/ignition/*
usr/share/ignition/*/*
usr/lib/*/cmake/*-plugin*/*
usr/lib/ruby/*/*
usr/share/*/*
usr/share/*/*/*
17 changes: 8 additions & 9 deletions ubuntu/debian/tests/build
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,21 @@ cmake_minimum_required(VERSION 3.5.1 FATAL_ERROR)
project(example)
# Find the ignition-plugin2 library
find_package(ignition-plugin2 REQUIRED COMPONENTS all)
#include_directories(\${ignition-plugin2_INCLUDE_DIRS})
# Find the gz-plugin2 library
find_package(gz-plugin2 REQUIRED COMPONENTS all)
#include_directories(\${gz-plugin2_INCLUDE_DIRS})
add_executable(plugin_test plugin_test.cc)
target_link_libraries(plugin_test
PRIVATE
ignition-plugin2::register
ignition-plugin2::loader
gz-plugin2::register
gz-plugin2::loader
)
EOF

cat <<EOF2 > plugin_test.cc
#include <ignition/plugin/Loader.hh>
#include <ignition/plugin/Register.hh>
#include <gz/plugin/Loader.hh>
#include <gz/plugin/Register.hh>
class Drive
{
Expand All @@ -44,7 +44,7 @@ IGNITION_ADD_PLUGIN(CautiousBot,
CautiousBot::Drive)
int main(int argc, char** argv) {
ignition::plugin::Loader pl;
gz::plugin::Loader pl;
return 0;
}
Expand All @@ -57,4 +57,3 @@ echo "build: OK"

./plugin_test
echo "plugin_test run: OK"

0 comments on commit 8174ba2

Please sign in to comment.