This repository has been archived by the owner on Feb 3, 2025. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 498
Find OGRE correctly in a system with pkg-config but without OGRE .pc files #2719
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…files This fixes the configuration in a system in which `pkg-config` is available in the path, but OGRE did not install any `.pc` file. Signed-off-by: Silvio Traversaro <silvio@traversaro.it>
iche033
approved these changes
Apr 29, 2020
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
looks good to me!
traversaro
added a commit
to iit-danieli-joint-lab/idjl-software-dependencies-vcpkg
that referenced
this pull request
May 4, 2020
On the top of the usual `vcpkg-idjl.zip` archive, this commit also generates the archive `vcpkg-idjl-with-gazebo.zip`, that is like the usual `vcpkg-idjl.zip` archive, but that also contains a `C:\idjl\gazebo\install` directory in which gazebo 11 and its dependencies are installed. As Gazebo in this case it is not installed via vcpkg, it is not possible to find it via the official vcpkg's integration via the `CMAKE_TOOLCHAIN_FILE`, so also a set of scripts is provided to set for a given terminal (`setup-deps.bat` and `setup-deps.sh`) or for the system (`addPathsToUserEnvVariables-deps.ps1` and `removePathsFromUserEnvVariables-deps.ps1`) the necessary environment variables to find the dependencies and run Gazebo. The specific version of Gazebo installed by the scripts are contained in the gazebo-repos.yaml file. They do refer to specific commit due to the fact that the Gazebo windows support requires some of the latest fix (some still pending, see gazebosim/gazebo-classic#2719), but they will be updated to tags once a release will be made including the required tags.
traversaro
added a commit
to iit-danieli-joint-lab/idjl-software-dependencies-vcpkg
that referenced
this pull request
May 4, 2020
On the top of the usual `vcpkg-idjl.zip` archive, this commit also generates the archive `vcpkg-idjl-with-gazebo.zip`, that is like the usual `vcpkg-idjl.zip` archive, but that also contains a `C:\idjl\gazebo\install` directory in which gazebo 11 and its dependencies are installed. As Gazebo in this case it is not installed via vcpkg, it is not possible to find it via the official vcpkg's integration via the `CMAKE_TOOLCHAIN_FILE`, so also a set of scripts is provided to set for a given terminal (`setup-deps.bat` and `setup-deps.sh`) or for the system (`addPathsToUserEnvVariables-deps.ps1` and `removePathsFromUserEnvVariables-deps.ps1`) the necessary environment variables to find the dependencies and run Gazebo. The specific version of Gazebo installed by the scripts are contained in the gazebo-repos.yaml file. They do refer to specific commit due to the fact that the Gazebo windows support requires some of the latest fix (some still pending, see gazebosim/gazebo-classic#2719), but they will be updated to tags once a release will be made including the required tags.
traversaro
added a commit
to iit-danieli-joint-lab/idjl-software-dependencies-vcpkg
that referenced
this pull request
May 4, 2020
On the top of the usual `vcpkg-idjl.zip` archive, this commit also generates the archive `vcpkg-idjl-with-gazebo.zip`, that is like the usual `vcpkg-idjl.zip` archive, but that also contains a `C:\idjl\gazebo\install` directory in which gazebo 11 and its dependencies are installed. As Gazebo in this case it is not installed via vcpkg, it is not possible to find it via the official vcpkg's integration via the `CMAKE_TOOLCHAIN_FILE`, so also a set of scripts is provided to set for a given terminal (`setup-deps.bat` and `setup-deps.sh`) or for the system (`addPathsToUserEnvVariables-deps.ps1` and `removePathsFromUserEnvVariables-deps.ps1`) the necessary environment variables to find the dependencies and run Gazebo. The specific version of Gazebo installed by the scripts are contained in the gazebo-repos.yaml file. They do refer to specific commit due to the fact that the Gazebo windows support requires some of the latest fix (some still pending, see gazebosim/gazebo-classic#2719), but they will be updated to tags once a release will be made including the required tags.
traversaro
added a commit
to iit-danieli-joint-lab/idjl-software-dependencies-vcpkg
that referenced
this pull request
May 4, 2020
On the top of the usual `vcpkg-idjl.zip` archive, this commit also generates the archive `vcpkg-idjl-with-gazebo.zip`, that is like the usual `vcpkg-idjl.zip` archive, but that also contains a `C:\idjl\gazebo\install` directory in which gazebo 11 and its dependencies are installed. As Gazebo in this case it is not installed via vcpkg, it is not possible to find it via the official vcpkg's integration via the `CMAKE_TOOLCHAIN_FILE`, so also a set of scripts is provided to set for a given terminal (`setup-deps.bat` and `setup-deps.sh`) or for the system (`addPathsToUserEnvVariables-deps.ps1` and `removePathsFromUserEnvVariables-deps.ps1`) the necessary environment variables to find the dependencies and run Gazebo. The specific version of Gazebo installed by the scripts are contained in the gazebo-repos.yaml file. They do refer to specific commit due to the fact that the Gazebo windows support requires some of the latest fix (some still pending, see gazebosim/gazebo-classic#2719), but they will be updated to tags once a release will be made including the required tags.
Recent versions of OGRE provide a |
The support for using |
Hi @j-rivero , if there is anything I can do to help in getting this merged feel free to let me know, thanks! |
j-rivero
approved these changes
Sep 30, 2020
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR fixes the configuration in a system in which
pkg-config
is available in the path, but OGRE did not install any.pc
file.This works by ensuing that any invocation of pkg-config to extract OGRE-specific versions only occurs if OGRE has been found by the
pkg_check_modules(OGRE OGRE>=${MIN_OGRE_VERSION})
call.An example of such a setup is when you build Gazebo for Windows using the vcpkg-installed OGRE (that as of 04/2020 does not install
.pc
files) on thewindows-2019
image of GitHub Actions (that instead containspkg-config
).Without this fix, the configuration fails with the following error (from https://github.com/robotology/robotology-superbuild-dependencies-vcpkg/runs/626432931):
An example of successful Gazebo configuration on GitHub Action with this fix is https://github.com/robotology/robotology-superbuild-dependencies-vcpkg/runs/626459680 .