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

0 ➡️ 2 #182

Merged
merged 7 commits into from
Aug 25, 2021
Merged

0 ➡️ 2 #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5320ac6
Backporting bad INCLUDE_DIRS cache confusion
mxgrey Nov 11, 2019
265a5f8
Close branch fix_bad_cache_entry
chapulina Nov 12, 2019
fd2f60c
Merged in fix_bad_cache_entry (pull request #178)
chapulina Nov 12, 2019
827c40d
Add codeowner (#85)
mxgrey Apr 28, 2020
361b762
make the OGRE plugin path discovery portable (#101)
seanyen Jul 13, 2020
b47db7f
Remove bitbucket-pipelines.yml (#181)
scpeters Aug 24, 2021
40b6c8e
0 ➡️ 2
chapulina Aug 24, 2021
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
19 changes: 0 additions & 19 deletions bitbucket-pipelines.yml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion cmake/FindIgnOGRE.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ macro(ign_ogre_declare_plugin TYPE COMPONENT)
list(APPEND OGRE_LIBRARIES ${TYPE}_${COMPONENT})
endmacro()

if (NOT WIN32)
if (NOT PKG_CONFIG_FOUND)
# pkg-config platforms
set(PKG_CONFIG_PATH_ORIGINAL $ENV{PKG_CONFIG_PATH})
set(PKG_CONFIG_PATH_TMP ${PKG_CONFIG_PATH_ORIGINAL})
Expand Down