-
Notifications
You must be signed in to change notification settings - Fork 6.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
8 changed files
with
219 additions
and
2 deletions.
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -65,12 +65,12 @@ | ||
|
|
||
| if (APPLE) | ||
| gz_find_package(OpenGL | ||
| REQUIRED_BY ogre ogre2 | ||
| - PKGCONFIG gl) | ||
| + PKGCONFIG opengl) | ||
| else() | ||
| gz_find_package(OpenGL REQUIRED | ||
| COMPONENTS OpenGL | ||
| OPTIONAL_COMPONENTS EGL | ||
| REQUIRED_BY ogre ogre2 | ||
| - PKGCONFIG gl) | ||
| + PKGCONFIG opengl) | ||
| endif() | ||
| @@ -81,5 +81,6 @@ | ||
|
|
||
| #-------------------------------------- | ||
| # Find OGRE | ||
| +if(0) | ||
| list(APPEND gz_ogre_components "RTShaderSystem" "Terrain" "Overlay" "Paging") | ||
|
|
||
| @@ -97,5 +98,6 @@ | ||
| "The software might compile and even work but support from upstream" | ||
| "could be reduced to accepting patches for newer versions") | ||
| endif() | ||
| endif() | ||
| +endif() | ||
|
|
||
| diff --git a/ogre2/src/terrain/Terra/CMakeLists.txt b/ogre2/src/terrain/Terra/CMakeLists.txt | ||
| --- a/ogre2/src/terrain/Terra/CMakeLists.txt | ||
| +++ b/ogre2/src/terrain/Terra/CMakeLists.txt | ||
| @@ -34,8 +34,10 @@ | ||
| # we must add this one manually for this to build correctly | ||
| ${OGRE2_INCLUDE}/Hlms/Pbs | ||
| ${OGRE2_INCLUDE}/Hlms/Common | ||
| PUBLIC | ||
| - ${CMAKE_CURRENT_LIST_DIR}/include | ||
| + $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include> | ||
| + $<INSTALL_INTERFACE:include> | ||
| ) | ||
|
|
||
| target_link_libraries(${PROJECT_NAME} PRIVATE GzOGRE2::GzOGRE2) | ||
| +install(TARGETS ${PROJECT_NAME} EXPORT gz-rendering7-ogre2) |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| set(PACKAGE_NAME rendering) | ||
|
|
||
| ignition_modular_library( | ||
| NAME ${PACKAGE_NAME} | ||
| REF ${PORT}_${VERSION} | ||
| VERSION ${VERSION} | ||
| SHA512 7c14b268694600b8529fef21130b34f516b26baac771c019b4248a67f84420c40d655e0abedf0b36c53b7cdf19941b3f4f3494696c831a83070632d004b30678 | ||
| OPTIONS | ||
| PATCHES | ||
| fix-dependencies.patch | ||
| ) | ||
|
|
||
| if(VCPKG_TARGET_IS_WINDOWS) | ||
| file(GLOB plugins "${CURRENT_PACKAGES_DIR}/lib/gz-rendering-7/engine-plugins/*.dll") | ||
| if (NOT plugins STREQUAL "") | ||
| file(COPY ${plugins} DESTINATION "${CURRENT_PACKAGES_DIR}/bin/engine-plugins/") | ||
| file(REMOVE ${plugins}) | ||
| endif() | ||
|
|
||
| file(GLOB plugins_debug "${CURRENT_PACKAGES_DIR}/debug/lib/gz-rendering-7/engine-plugins/*.dll") | ||
| if (NOT plugins_debug STREQUAL "") | ||
| file(COPY ${plugins_debug} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin/engine-plugins/") | ||
| file(REMOVE ${plugins_debug}) | ||
| endif() | ||
| endif() |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| { | ||
| "name": "gz-rendering7", | ||
| "version": "7.4.1", | ||
| "description": "Gazebo Rendering is a C++ library designed to provide an abstraction for different rendering engines. It offers unified APIs for creating 3D graphics applications.", | ||
| "homepage": "https://gazebosim.org/libs/rendering", | ||
| "license": "Apache-2.0", | ||
| "dependencies": [ | ||
| "freeimage", | ||
| "gz-cmake3", | ||
| "gz-common5", | ||
| "gz-math7", | ||
| "gz-plugin2", | ||
| "gz-utils2", | ||
| { | ||
| "name": "ignition-modularscripts", | ||
| "host": true | ||
| }, | ||
| { | ||
| "name": "ogre-next", | ||
| "features": [ | ||
| "planar-reflections" | ||
| ] | ||
| }, | ||
| "opengl" | ||
| ] | ||
| } |
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| { | ||
| "versions": [ | ||
| { | ||
| "git-tree": "5fa361453bcae9a0e8acee956057e9436f8d1377", | ||
| "version": "7.4.1", | ||
| "port-version": 0 | ||
| } | ||
| ] | ||
| } |