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.

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

Support platforms in which qwt headers are not installed in a qwt directory #2887

Merged
merged 1 commit into from
Nov 23, 2020

Conversation

traversaro
Copy link
Collaborator

@traversaro traversaro commented Nov 22, 2020

This change permits to fix #2886 without touching at all the CMake code related to QWT (that may be error prone in my experience), and automatically falling back to the usual qwt include style if either the __has_include functionality is not available, or qwt.h is not available. The __has_include code has been added in line with what described in https://gcc.gnu.org/onlinedocs/gcc-10.1.0/cpp/_005f_005fhas_005finclude.html, to ensure that it works fine on any < C++17 compiler, even if the use of C++17 should be enforces by the use of the ignition libraries that use C++17 .

With this change, it is possible to build Gazebo gazebo11 branch on conda (starting from a minimal conda distro such as Miniconda or Miniforge) on Windows by simply running:

# Create a new environment to avoid polluting the base one
conda create -n gazebo-env
conda activate gazebo-env 
# Install Gazebo dependencies 
conda install -c conda-forge --only-deps gazebo 
# Install build dependencies
conda install  -c conda-forge pkg-config cmake
git clone https://github.com/osrf/gazebo
cd gazebo
mkdir build
cd build
cmake -DCMAKE_BUILD_TYPE=Release ..
cmake --build . --config Release

@traversaro
Copy link
Collaborator Author

fyi @Tobias-Fischer @wolfv as this is about upstreaming a Conda-specific patch.

@chapulina chapulina added the 11 Gazebo 11 label Nov 23, 2020
Copy link
Contributor

@chapulina chapulina left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the fix and all the work with conda! Looks good to me 👍

@chapulina chapulina merged commit 25d3381 into gazebosim:gazebo11 Nov 23, 2020
@traversaro traversaro deleted the patch-3 branch January 22, 2021 14:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
11 Gazebo 11
Projects
None yet
Development

Successfully merging this pull request may close these issues.

QWT include style
2 participants