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

Depend on ignition-utils1 cli component #55

Merged
merged 4 commits into from
Aug 9, 2021
Merged

Depend on ignition-utils1 cli component #55

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
f9f27bc
Depend on ignition-utils1 with cli component
scpeters Jul 24, 2021
7f3df50
Use SuppressWarning.hh from ignition-utils
scpeters Jul 24, 2021
e1366df
rm configure.bat
scpeters Aug 9, 2021
17c2ce2
Add libignition-tools-dev to tutorial
scpeters Aug 9, 2021
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
1 change: 1 addition & 0 deletions .github/ci/packages.apt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
libignition-cmake2-dev
libignition-tools-dev
libignition-utils1-cli-dev
6 changes: 6 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,12 @@ ign_find_package(DL
ign_find_package(ignition-tools QUIET)


#--------------------------------------
# Find ignition-utils
ign_find_package(ignition-utils1 REQUIRED COMPONENTS cli)
set(IGN_UTILS_VER ${ignition-utils1_VERSION_MAJOR})


#============================================================================
# Configure the build
#============================================================================
Expand Down
25 changes: 0 additions & 25 deletions configure.bat
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ign_create_core_library(
CXX_STANDARD 17)

target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME}
PUBLIC ignition-cmake${IGN_CMAKE_VER}::utilities)
PUBLIC ignition-utils${IGN_UTILS_VER}::ignition-utils${IGN_UTILS_VER})

# Build the unit tests
ign_build_tests(
Expand Down
2 changes: 1 addition & 1 deletion core/include/ignition/plugin/Info.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include <string>
#include <unordered_map>

#include <ignition/utilities/SuppressWarning.hh>
#include <ignition/utils/SuppressWarning.hh>

#include <ignition/plugin/Export.hh>

Expand Down
2 changes: 1 addition & 1 deletion core/include/ignition/plugin/Plugin.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <map>
#include <string>

#include <ignition/utilities/SuppressWarning.hh>
#include <ignition/utils/SuppressWarning.hh>

#include <ignition/plugin/Export.hh>
#include <ignition/plugin/Info.hh>
Expand Down
2 changes: 1 addition & 1 deletion core/include/ignition/plugin/detail/Factory.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include <memory>
#include <utility>

#include <ignition/utilities/SuppressWarning.hh>
#include <ignition/utils/SuppressWarning.hh>

#include <ignition/plugin/Factory.hh>

Expand Down
2 changes: 1 addition & 1 deletion loader/include/ignition/plugin/Loader.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include <typeinfo>
#include <unordered_set>

#include <ignition/utilities/SuppressWarning.hh>
#include <ignition/utils/SuppressWarning.hh>

#include <ignition/plugin/loader/Export.hh>
#include <ignition/plugin/PluginPtr.hh>
Expand Down
2 changes: 1 addition & 1 deletion register/include/ignition/plugin/detail/Register.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include <type_traits>
#include <utility>

#include <ignition/utilities/SuppressWarning.hh>
#include <ignition/utils/SuppressWarning.hh>

#include <ignition/plugin/EnablePluginFromThis.hh>
#include <ignition/plugin/Info.hh>
Expand Down
2 changes: 1 addition & 1 deletion tutorials/02_installation.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ sudo apt install libignition-plugin-dev

1. Install Ignition dependencies
```
sudo apt-get install libignition-cmake2-dev
sudo apt-get install libignition-cmake2-dev libignition-tools-dev libignition-utils1-cli-dev
```

2. Clone the repository
Expand Down