2 ➡️ 3 #156

chapulina · 2021-02-22T22:49:54Z

➡️ 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)

… same

[Citadel] Reduce example names to fix build on Windows Approved-by: Steve Peters <[email protected]> Approved-by: Louise Poubel <[email protected]>

Use mathjax to render equations Approved-by: Steve Peters <[email protected]> Approved-by: Louise Poubel <[email protected]>

…-without-pkgconfig-1584891888504 (pull request #182) Fix use of FindZIP without pkg-config Approved-by: Steve Peters <[email protected]> Approved-by: Nate Koenig <[email protected]>

Preparing for ign-cmake 2.2.0 release Approved-by: Nate Koenig <[email protected]>

… as Requires.private in pkg-config files

…with this branch

Ensure private dependencies are encoded in pkgconfig as Requires.private Approved-by: Ian Chen <[email protected]> Approved-by: Louise Poubel <[email protected]>

* mv hgignore * add gitignore Signed-off-by: claireyywang <[email protected]>

* [ign-cmake2] Update BitBucket links Signed-off-by: Louise Poubel <[email protected]> Co-authored-by: Jose Luis Rivero <[email protected]>

Signed-off-by: Michael X. Grey <[email protected]>

Signed-off-by: Louise Poubel <[email protected]>

PR collection labeler

Signed-off-by: Michael Carroll <[email protected]>

Currently we rebuild documentation on every build. This adds an option to disable this (default is enabled). This is helpful for development environments with repeated builds. It can be set via colcon's cmake-args: colcon build --cmake-args -DBUILD_DOCS=OFF Signed-off-by: Michael Carroll <[email protected]>

* Tutorial about developing with cmake and colcon Co-authored-by: Alejandro Hernández Cordero <[email protected]> Co-authored-by: Louise Poubel <[email protected]> Co-authored-by: Ashton Larkin <[email protected]> Signed-off-by: Michael Carroll <[email protected]>

Signed-off-by: Michael Carroll <[email protected]> Co-authored-by: Ashton Larkin <[email protected]> Co-authored-by: Ashton Larkin <[email protected]>

Signed-off-by: Mabel Zhang <[email protected]> Co-authored-by: John Shepherd <[email protected]>

* fix: Use PACKAGE_PREFIX_DIR to ensure relocatable CMake install for conan Signed-off-by: Stefan Profanter <[email protected]> * Compute ignition .pc file relative path to prefix * Compute path to prefix for ignition-cmake.pc Signed-off-by: Steve Peters <[email protected]> Co-authored-by: Louise Poubel <[email protected]> Co-authored-by: Steve Peters <[email protected]> Co-authored-by: Jose Luis Rivero <[email protected]>

Signed-off-by: Steve Peters <[email protected]>

Signed-off-by: Jenn Nguyen <[email protected]>

Signed-off-by: Ashton Larkin <[email protected]>

* added port & release to PR templates Signed-off-by: Jenn Nguyen <[email protected]> * updated branch comparision links Signed-off-by: Jenn Nguyen <[email protected]> * updated PR template Signed-off-by: Jenn Nguyen <[email protected]> * updated PR template Signed-off-by: Jenn Nguyen <[email protected]>

Signed-off-by: Ashton Larkin <[email protected]>

Signed-off-by: Jenn Nguyen <[email protected]>

scpeters

tests are failing

examples/core_child_private/CMakeLists.txt

tutorials/developing_with_ign-cmake.md

Signed-off-by: Louise Poubel <[email protected]>

Signed-off-by: Martin Pecka <[email protected]>

Signed-off-by: Louise Poubel <[email protected]>

Signed-off-by: Mabel Zhang <[email protected]>

adlarkin · 2021-02-26T05:03:46Z

There were a few PRs that have been merged to ign-cmake2 since this forward port was opened, can you update this PR so that we can forward port these new PRs as well? I believe we are only missing #150, #158, and #159.

Signed-off-by: Louise Poubel <[email protected]>

chapulina · 2021-02-26T20:53:56Z

can you update this PR so that we can forward port these new PRs as well?

Done 👍

adlarkin

Looks good to me. We should forward-port more often so that these PRs are smaller 😅

I think we will need to manually set DCO to pass because of the bitbucket PR signoffs.

j-rivero and others added 30 commits November 20, 2019 18:41

Use shorter names to make windows happy

598ee27

Reduce name for core_no_deps

287efcb

fix test, only folder names have changed, package names are still the…

3560706

… same

Close branch ign-cmake2_short_names

a57fe90

Merged in ign-cmake2_short_names (pull request #180)

63f9aa3

[Citadel] Reduce example names to fix build on Windows Approved-by: Steve Peters <[email protected]> Approved-by: Louise Poubel <[email protected]>

Use mathjax to render equations

9e8404f

Close branch use mathjax

417305a

Merged in use mathjax (pull request #181)

f109bbb

Use mathjax to render equations Approved-by: Steve Peters <[email protected]> Approved-by: Louise Poubel <[email protected]>

Fix use of FindZIP without pkg-config

4ff79d0

Merged in traversaro/ign-cmake-7/Silvio-Traversaro/fix-use-of-findzip…

b9dbe85

…-without-pkgconfig-1584891888504 (pull request #182) Fix use of FindZIP without pkg-config Approved-by: Steve Peters <[email protected]> Approved-by: Nate Koenig <[email protected]>

Preparing for ign-cmake 2.2.0 release

9c5b0d9

Changelog

f959d2f

Close branch cmake2-2-0

8cb76bc

Merged in cmake2-2-0 (pull request #183)

b4fe3af

Preparing for ign-cmake 2.2.0 release Approved-by: Nate Koenig <[email protected]>

Added tag ignition-cmake2_2.2.0 for changeset 8093f0df9e9e

2a379b7

Added tag ignition-cmake2_2.2.0 for changeset 65f0d7e6fa06

ebde577

add test illustrating bug that private dependencies are not specified…

fe27cfd

… as Requires.private in pkg-config files

fix syntax error in test

e4074e4

fix _PKGCONFIG_TYPE variable name

55cf03a

the test wasn't actually failing to illustrate the problem; fix that …

15c1a5f

…with this branch

merge with pkgconfig_requires_private_broken_test

b2dc5cf

copyright year

b540ddc

Close branch pkgconfig_requires_private

c2e1033

Merged in pkgconfig_requires_private (pull request #184)

421b651

Ensure private dependencies are encoded in pkgconfig as Requires.private Approved-by: Ian Chen <[email protected]> Approved-by: Louise Poubel <[email protected]>

[ign-cmake2] Add .gitignore (#76)

976141e

* mv hgignore * add gitignore Signed-off-by: claireyywang <[email protected]>

[ign-cmake2] Update BitBucket links (#74)

d85faab

* [ign-cmake2] Update BitBucket links Signed-off-by: Louise Poubel <[email protected]> Co-authored-by: Jose Luis Rivero <[email protected]>

Add codeowner (#82)

8e5305e

Signed-off-by: Michael X. Grey <[email protected]>

PR collection labeler

2d1b1b3

Signed-off-by: Louise Poubel <[email protected]>

Merge branch 'ign-cmake2' into collection_labeler

600cc52

Merge pull request #86 from ignitionrobotics/collection_labeler

b28cfb1

PR collection labeler

mjcarroll and others added 13 commits January 5, 2021 17:04

Make ign-cmake consider hpp files headers as well (#143)

0253110

Signed-off-by: Michael Carroll <[email protected]>

Set CMake's CMP0079 policy (#146)

bed3f7b

Signed-off-by: Michael Carroll <[email protected]> Co-authored-by: Ashton Larkin <[email protected]> Co-authored-by: Ashton Larkin <[email protected]>

Windows installation via conda-forge (#139)

f78d69e

Signed-off-by: Mabel Zhang <[email protected]> Co-authored-by: John Shepherd <[email protected]>

Bump to 2.7.0~pre1 (#147)

f150619

Signed-off-by: Steve Peters <[email protected]>

Added issue & PR templates (#148)

e49e95b

Signed-off-by: Jenn Nguyen <[email protected]>

fixed repo link (#149)

e8add1a

Signed-off-by: Jenn Nguyen <[email protected]>

Update codeowners (#151)

a00a8c9

Signed-off-by: Ashton Larkin <[email protected]>

Fix codeownders (#155)

f0382f5

Signed-off-by: Ashton Larkin <[email protected]>

Remove issue & PR templates (#153)

aac33b3

Signed-off-by: Jenn Nguyen <[email protected]>

chapulina requested a review from mxgrey as a code owner February 22, 2021 22:49

scpeters reviewed Feb 23, 2021

View reviewed changes

examples/core_child_private/CMakeLists.txt Outdated Show resolved Hide resolved

tutorials/developing_with_ign-cmake.md Outdated Show resolved Hide resolved

chapulina added a commit that referenced this pull request Feb 23, 2021

ign-cmake2 -> ign-cmake3 (#156)

4b6f95f

Signed-off-by: Louise Poubel <[email protected]>

peci1 and others added 3 commits February 25, 2021 15:31

Support imported targets in FindIgnOGRE.cmake (#150)

f907b0b

Signed-off-by: Martin Pecka <[email protected]>

README tweaks (#158)

4d2a19a

Signed-off-by: Louise Poubel <[email protected]>

fix cmake message types (#159)

96faa49

Signed-off-by: Mabel Zhang <[email protected]>

2 ➡️ 3

a5254d3

Signed-off-by: Louise Poubel <[email protected]>

chapulina force-pushed the chapulina/2_to_3 branch from 4b6f95f to a5254d3 Compare February 26, 2021 20:53

adlarkin approved these changes Feb 26, 2021

View reviewed changes

chapulina merged commit 05d8e2a into main Mar 1, 2021

chapulina deleted the chapulina/2_to_3 branch March 1, 2021 17:31

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

2 ➡️ 3 #156

2 ➡️ 3 #156

chapulina commented Feb 22, 2021 •

edited

Loading

scpeters left a comment

adlarkin commented Feb 26, 2021

chapulina commented Feb 26, 2021

adlarkin left a comment •

edited

Loading

2 ➡️ 3 #156

2 ➡️ 3 #156

Conversation

chapulina commented Feb 22, 2021 • edited Loading

➡️ Forward port

scpeters left a comment

Choose a reason for hiding this comment

adlarkin commented Feb 26, 2021

chapulina commented Feb 26, 2021

adlarkin left a comment • edited Loading

Choose a reason for hiding this comment

chapulina commented Feb 22, 2021 •

edited

Loading

adlarkin left a comment •

edited

Loading