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

Jump to bottom

Bumps in garden : ign-cmake3, ign-util2, ign-plugin2 #74

Merged
merged 5 commits into from
Apr 11, 2022
Merged

Bumps in garden : ign-cmake3, ign-util2, ign-plugin2 #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0b8cfc5
Bumps in garden : ign-plugin2
methylDragon Apr 6, 2022
3cd814d
Revert plugin.cc changes
methylDragon Apr 7, 2022
6269687
Correct find_package semver
methylDragon Apr 7, 2022
e60bc5d
Remove ignition-cmake3 version
methylDragon Apr 8, 2022
bff7428
Use ignition-common5 and ignition-math7 only
methylDragon Apr 8, 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 .github/ci/packages.apt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
libignition-cmake2-dev
libignition-cmake3-dev
libignition-tools-dev
libignition-utils1-cli-dev
libignition-utils2-cli-dev
8 changes: 4 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ project(ignition-plugin2 VERSION 2.0.0)
#============================================================================
# Find ignition-cmake
#============================================================================
find_package(ignition-cmake2 2.8.0 REQUIRED)
set(IGN_CMAKE_VER ${ignition-cmake2_VERSION_MAJOR})
find_package(ignition-cmake3 REQUIRED)
set(IGN_CMAKE_VER ${ignition-cmake3_VERSION_MAJOR})

#============================================================================
# Configure the project
Expand Down Expand Up @@ -43,8 +43,8 @@ find_program(IGN_TOOLS_PROGRAM ign)

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


#============================================================================
Expand Down
22 changes: 5 additions & 17 deletions examples/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,14 @@ cmake_minimum_required(VERSION 3.5.1 FATAL_ERROR)

project(examples)

# Find the ignition-plugin library
find_package(ignition-plugin2 QUIET REQUIRED COMPONENTS all)
set(IGN_PLUGIN_VER ${ignition-plugin2_VERSION_MAJOR})
find_package(ignition-common2 QUIET)
set(IGN_COMMON_VER ${ignition-common2_VERSION_MAJOR})
if(NOT ignition-common2_FOUND)
find_package(ignition-common3 QUIET)
set(IGN_COMMON_VER ${ignition-common3_VERSION_MAJOR})
endif()
if(NOT ignition-common2_FOUND AND NOT ignition-common3_FOUND)
find_package(ignition-common4 QUIET REQUIRED)
set(IGN_COMMON_VER ${ignition-common4_VERSION_MAJOR})
endif()

find_package(ignition-math5 QUIET)
set(IGN_MATH_VER ${ignition-math5_VERSION_MAJOR})
if(NOT ignition-math5_FOUND)
find_package(ignition-math6 QUIET REQUIRED)
set(IGN_MATH_VER ${ignition-math6_VERSION_MAJOR})
endif()
find_package(ignition-common5 QUIET)
set(IGN_COMMON_VER ${ignition-common5_VERSION_MAJOR})

find_package(ignition-math7 QUIET)
set(IGN_MATH_VER ${ignition-math7_VERSION_MAJOR})

add_subdirectory(plugins)

Expand Down
4 changes: 2 additions & 2 deletions loader/conf/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set(ign_library_path "${CMAKE_BINARY_DIR}/test/lib/$<CONFIG>/ruby/ignition/cmd${

# Generate a configuration file for internal testing.
# Note that the major version of the library is included in the name.
# Ex: plugin1.yaml
# Ex: plugin2.yaml
configure_file(
"${IGN_DESIGNATION}.yaml.in"
"${CMAKE_CURRENT_BINARY_DIR}/${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}.yaml.configured" @ONLY)
Expand All @@ -17,7 +17,7 @@ set(ign_library_path "${CMAKE_INSTALL_PREFIX}/lib/ruby/ignition/cmd${IGN_DESIGNA

# Generate the configuration file that is installed.
# Note that the major version of the library is included in the name.
# Ex: plugin1.yaml
# Ex: plugin2.yaml
configure_file(
"${IGN_DESIGNATION}.yaml.in"
"${CMAKE_CURRENT_BINARY_DIR}/${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}.yaml" @ONLY)
Expand Down
4 changes: 2 additions & 2 deletions loader/src/cmd/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ install(
#===============================================================================
# Generate the ruby script for internal testing.
# Note that the major version of the library is included in the name.
# Ex: cmdplugin1.rb
# Ex: cmdplugin2.rb
set(cmd_script_generated_test "${CMAKE_BINARY_DIR}/test/lib/$<CONFIG>/ruby/ignition/cmd${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}.rb")
set(cmd_script_configured_test "${CMAKE_CURRENT_BINARY_DIR}/test_cmd${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}.rb.configured")

Expand All @@ -46,7 +46,7 @@ file(GENERATE
# Used for the installed version.
# Generate the ruby script that gets installed.
# Note that the major version of the library is included in the name.
# Ex: cmdplugin1.rb
# Ex: cmdplugin2.rb
set(cmd_script_generated "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/cmd${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}.rb")
set(cmd_script_configured "${CMAKE_CURRENT_BINARY_DIR}/cmd${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}.rb.configured")

Expand Down
6 changes: 3 additions & 3 deletions tutorials/02_installation.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ sudo apt install libignition-plugin-dev

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

1. Install Ignition Tools if you want to use the `ign plugin` command line tool:
Expand Down Expand Up @@ -88,15 +88,15 @@ Sierra (10.12) or later.
2. Run the following commands
```bash
brew tap osrf/simulation
brew install ignition-plugin1
brew install ignition-plugin2
```

## Source Installation

1. Install dependencies
```bash
brew tap osrf/simulation
brew install ignition-plugin1 --only-dependencies
brew install ignition-plugin2 --only-dependencies
```

2. Clone the repository
Expand Down