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

2 ➡️ 3 (main) #226

Merged
merged 34 commits into from
Apr 6, 2022
Merged

2 ➡️ 3 (main) #226

merged 34 commits into from
Apr 6, 2022

Conversation

chapulina
Copy link
Contributor

@chapulina chapulina commented Apr 6, 2022

➡️ Forward port

Port ign-cmake2 to main

Branch comparison: main...ign-cmake2

Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)

iche033 and others added 30 commits August 2, 2021 15:15
* add logic to find ogre and its components when there is also another source installation in the colcon workspace

Signed-off-by: Ian Chen <[email protected]>

* set ogre var to empty string, fix pkg result check, typo

Signed-off-by: Ian Chen <[email protected]>

* add comment about unsetting ogre var

Signed-off-by: Ian Chen <[email protected]>

* find lib with _d suffix

Signed-off-by: Ian Chen <[email protected]>
* Special case for ogre2.2 on Windows

Signed-off-by: Michael Carroll <[email protected]>
* make the OGRE plugin path discovery portable (#101)
* Remove bitbucket-pipelines.yml (#181)

Signed-off-by: Louise Poubel <[email protected]>
* Include IMAGE_PATH directories in ign_create_docs

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

* style

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

Co-authored-by: Ashton Larkin <[email protected]>
* Fix problems on IgnOGRE when version is not found

Signed-off-by: Jose Luis Rivero <[email protected]>
The include directories of cppcheck need individual -I flags ahead of each directory.

Signed-off-by: Addisu Z. Taddese <[email protected]>
Signed-off-by: Addisu Z. Taddese <[email protected]>
* IgnConfigureProject: add NO_IGNITION_PREFIX option

This would allow projects (like sdformat) to use
ignition-cmake2 without requiring the project name
to start with ignition-.

Signed-off-by: Steve Peters <[email protected]>
* Add REPLACE_IGNITION_INCLUDE_PATH option to
  IgnConfigureProject.

The include paths are now configurable and default
to ignition/${IGN_DESIGNATION} to match existing
behavior.

* Use ign_install_all_headers in example

Confirm location of auto-generated headers by including
them from AlmostEmpty.cc

* Use IGN_INCLUDE_INSTALL_DIR_POSTFIX in templates

Signed-off-by: Steve Peters <[email protected]>
…IXES on Windows (#189)

`CMAKE_FIND_LIBRARY_PREFIXES` and `CMAKE_FIND_LIBRARY_SUFFIXES` are variables that are used by
CMake to change the behaviour of the `find_library` call. Changing them to `.lib;.dll` in the CMake config
file of every ignition project affect silently any downstream project that calls `find_package(ignition-<pkg>)`,
even if transitevely, leading to subtle bugs.

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

Co-authored-by: Jose Luis Rivero <[email protected]>
* Add find FindIgnURDFDOM module.

Prefer pkg-config since the CMake module at urdfdom lacks the capabilities of version checking.

Signed-off-by: Teo Koon Peng <[email protected]>
Co-authored-by: Jose Luis Rivero <[email protected]>
Co-authored-by: Alejandro Hernández Cordero <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
Add HIDE_SYMBOLS_BY_DEFAULT parameter to
ign_configure_build that will hide symbols by default
if they are not explicitly specified as visible.
This parameter is used to set CMAKE_C_VISIBILITY_PRESET
and CMAKE_CXX_VISIBILITY_PRESET.

Signed-off-by: Steve Peters <[email protected]>
The cmake config template file currently creates legacy
cmake variables with capital letters like
IGNITION-MATH_LIBRARIES and IGNITION-MATH_INCLUDE_DIRS.
Since sdformat uses inconsistent case in the legacy cmake
variables, like SDFormat_LIBRARIES, the prefix for these
variables is made configurable as LEGACY_PROJECT_PREFIX
in the ign_create_core_library function.

Signed-off-by: Steve Peters <[email protected]>
This adds an example that builds a static library
and a second example that links against that static
library.

Signed-off-by: Steve Peters <[email protected]>
Signed-off-by: Michael Carroll <[email protected]>
* Replace deprecated PythonInterp with Python3

Signed-off-by: Bi0T1N <[email protected]>
* Support for running compiler sanitizers

Signed-off-by: Jose Luis Rivero <[email protected]>
Co-authored-by: Addisu Z. Taddese <[email protected]>
Follow-up after #219

Signed-off-by: Michel Hidalgo <[email protected]>
j-rivero and others added 3 commits April 4, 2022 16:59
* IgnPython: restore PYTHON_EXECUTABLE for now

The PYTHON_EXECUTABLE cmake variable was replaced by
Python3_EXECUTABLE in #218 for new versions of cmake.
This breaks packages currently using the previous
variable name. This restores PYTHON_EXECUTABLE to
allow a tick-tock cycle for downstream packages
to transition.

Signed-off-by: Steve Peters <[email protected]>
Co-authored-by: Jose Luis Rivero <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
@chapulina chapulina merged commit 4c7c50e into main Apr 6, 2022
@chapulina chapulina deleted the chapulina/2_to_3 branch April 6, 2022 19:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.