mirror of https://github.com/microsoft/vcpkg.git
[gz-cmake] Update to 4.3.0 (#53392)
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
parent
f298fb4ef3
commit
9c16a692ff
|
|
@ -54,10 +54,10 @@ index 70f7a76..e39a3fd 100644
|
|||
set(GzBullet_FOUND false)
|
||||
# create Bullet target
|
||||
diff --git a/cmake/FindGzOGRE2.cmake b/cmake/FindGzOGRE2.cmake
|
||||
index 2decd84..dd2c2c2 100644
|
||||
index 5e63088..9b12a9e 100644
|
||||
--- a/cmake/FindGzOGRE2.cmake
|
||||
+++ b/cmake/FindGzOGRE2.cmake
|
||||
@@ -146,7 +146,7 @@ endmacro()
|
||||
@@ -163,7 +163,7 @@ endmacro()
|
||||
find_package(PkgConfig QUIET)
|
||||
if (PkgConfig_FOUND)
|
||||
set(PKG_CONFIG_PATH_ORIGINAL $ENV{PKG_CONFIG_PATH})
|
||||
|
|
@ -66,7 +66,7 @@ index 2decd84..dd2c2c2 100644
|
|||
message(STATUS "Looking for OGRE using the name: ${GZ_OGRE2_PROJECT_NAME}")
|
||||
if (GZ_OGRE2_PROJECT_NAME STREQUAL "OGRE2")
|
||||
set(OGRE2_INSTALL_PATH "OGRE-2.${GzOGRE2_FIND_VERSION_MINOR}")
|
||||
@@ -173,6 +173,7 @@ if (PkgConfig_FOUND)
|
||||
@@ -190,6 +190,7 @@ if (PkgConfig_FOUND)
|
||||
set(GZ_PKG_NAME ${OGRE2_INSTALL_PATH})
|
||||
set(OGRE2_FOUND ${${GZ_OGRE2_PROJECT_NAME}_FOUND}) # sync possible OGRE-Next to OGRE2
|
||||
fix_pkgconfig_prefix_jammy_bug("${${GZ_OGRE2_PROJECT_NAME}_LIBRARY_DIRS}" OGRE2_LIBRARY_DIRS)
|
||||
|
|
@ -74,21 +74,7 @@ index 2decd84..dd2c2c2 100644
|
|||
set(OGRE2_LIBRARIES ${${GZ_OGRE2_PROJECT_NAME}_LIBRARIES}) # sync possible Ogre-Next ot OGRE2
|
||||
else()
|
||||
# look for OGRE2 installed from source
|
||||
@@ -264,10 +265,10 @@ if (PkgConfig_FOUND)
|
||||
get_filename_component(dir_name "${dir}" NAME)
|
||||
if ("${dir_name}" STREQUAL ${GZ_PKG_NAME})
|
||||
set(dir_include "${dir}/RenderSystems/GL3Plus")
|
||||
- else()
|
||||
- set(dir_include "${dir}")
|
||||
+ if(EXISTS "${dir_include}")
|
||||
+ list(APPEND OGRE2_INCLUDE_DIRS "${dir_include}")
|
||||
+ endif()
|
||||
endif()
|
||||
- list(APPEND OGRE2_INCLUDE_DIRS ${dir_include})
|
||||
endforeach()
|
||||
|
||||
file(READ ${OGRE2_INCLUDE}/OgrePrerequisites.h OGRE_TEMP_VERSION_CONTENT)
|
||||
@@ -309,6 +310,9 @@ if (PkgConfig_FOUND)
|
||||
@@ -336,6 +337,9 @@ if (PkgConfig_FOUND)
|
||||
"${OGRE2LIBNAME}${component}_d"
|
||||
"${OGRE2LIBNAME}${component}.${OGRE2_VERSION}"
|
||||
"${OGRE2LIBNAME}${component}"
|
||||
|
|
@ -98,7 +84,7 @@ index 2decd84..dd2c2c2 100644
|
|||
HINTS ${OGRE2_LIBRARY_DIRS})
|
||||
if (NOT "${OGRE2-${component}}" STREQUAL "OGRE2-${component}-NOTFOUND")
|
||||
message(STATUS " + component ${component}: found")
|
||||
@@ -400,17 +404,22 @@ else() #PkgConfig_FOUND
|
||||
@@ -427,17 +431,22 @@ else() #PkgConfig_FOUND
|
||||
set(OGRE2_VERSION_MINOR "")
|
||||
set(OGRE2_RESOURCE_PATH "")
|
||||
|
||||
|
|
@ -125,7 +111,7 @@ index 2decd84..dd2c2c2 100644
|
|||
HINTS ${OGRE2_PATHS}
|
||||
NO_DEFAULT_PATH)
|
||||
|
||||
@@ -450,8 +459,11 @@ else() #PkgConfig_FOUND
|
||||
@@ -477,8 +486,11 @@ else() #PkgConfig_FOUND
|
||||
|
||||
find_library(${PREFIX}_LIBRARY
|
||||
NAMES
|
||||
|
|
@ -139,7 +125,7 @@ index 2decd84..dd2c2c2 100644
|
|||
HINTS
|
||||
${OGRE2_LIBRARY_DIRS}
|
||||
NO_DEFAULT_PATH)
|
||||
@@ -506,6 +518,7 @@ else() #PkgConfig_FOUND
|
||||
@@ -533,6 +545,7 @@ else() #PkgConfig_FOUND
|
||||
ogre_find_component(Overlay OgreOverlaySystem.h "Overlay")
|
||||
ogre_find_component(HlmsPbs OgreHlmsPbs.h Hlms/Pbs/)
|
||||
ogre_find_component(HlmsUnlit OgreHlmsUnlit.h Hlms/Unlit)
|
||||
|
|
@ -147,7 +133,7 @@ index 2decd84..dd2c2c2 100644
|
|||
|
||||
ogre_find_plugin(Plugin_ParticleFX OgreParticleFXPrerequisites.h PlugIns/ParticleFX/include)
|
||||
ogre_find_plugin(RenderSystem_GL3Plus OgreGL3PlusRenderSystem.h RenderSystems/GL3Plus/include)
|
||||
@@ -521,7 +534,7 @@ else() #PkgConfig_FOUND
|
||||
@@ -548,7 +561,7 @@ else() #PkgConfig_FOUND
|
||||
if(${HLMS_POS} GREATER -1)
|
||||
foreach (dir ${OGRE2_INCLUDE_DIRS})
|
||||
get_filename_component(dir_name "${dir}" NAME)
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
string(REGEX MATCH "^[0-9]+" VERSION_MAJOR "${VERSION}")
|
||||
string(REGEX MATCH "^gz-([a-z-]+)" MATCHED_VALUE "${PORT}")
|
||||
set(PACKAGE_NAME "${CMAKE_MATCH_1}")
|
||||
|
||||
ignition_modular_library(
|
||||
NAME "${PACKAGE_NAME}"
|
||||
REF "${PORT}${VERSION_MAJOR}_${VERSION}"
|
||||
VERSION "${VERSION}"
|
||||
SHA512 c22d942880acdd9de5613e7ebf71395d3b1bc9b70543fbcf284ccf271f593e198c9918a1c6883288d39b4c022fcb206d8b4f626fb11460d421efc2751b2e8d7c
|
||||
PATCHES
|
||||
find-modules.diff
|
||||
gz-find-package.diff
|
||||
gz-import-target.diff
|
||||
lock-dependencies.diff
|
||||
pkg-check-modules.diff
|
||||
)
|
||||
|
||||
configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY)
|
||||
string(REGEX MATCH "^[0-9]+" VERSION_MAJOR "${VERSION}")
|
||||
string(REGEX MATCH "^gz-([a-z-]+)" MATCHED_VALUE "${PORT}")
|
||||
set(PACKAGE_NAME "${CMAKE_MATCH_1}")
|
||||
|
||||
ignition_modular_library(
|
||||
NAME "${PACKAGE_NAME}"
|
||||
REF "${PORT}${VERSION_MAJOR}_${VERSION}"
|
||||
VERSION "${VERSION}"
|
||||
SHA512 1419a5d6ea161f3115f15ca69eb09401c25e6ac4a0d4f4844cfde2ed4746d567c4d95643a4ad07467b720deda6cd0add5296613c27b067701b0d3afe162ffeba
|
||||
PATCHES
|
||||
find-modules.diff
|
||||
gz-find-package.diff
|
||||
gz-import-target.diff
|
||||
lock-dependencies.diff
|
||||
pkg-check-modules.diff
|
||||
)
|
||||
|
||||
configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "gz-cmake",
|
||||
"version": "4.2.1",
|
||||
"version": "4.3.0",
|
||||
"description": "CMake helper functions for building robotic applications",
|
||||
"homepage": "https://gazebosim.org/libs/cmake/",
|
||||
"license": null,
|
||||
|
|
|
|||
|
|
@ -3685,7 +3685,7 @@
|
|||
"port-version": 1
|
||||
},
|
||||
"gz-cmake": {
|
||||
"baseline": "4.2.1",
|
||||
"baseline": "4.3.0",
|
||||
"port-version": 0
|
||||
},
|
||||
"gz-common": {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "b0c5ab8041ebb52059478295d98a2dd29ee165ff",
|
||||
"version": "4.3.0",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "9646b81122ef1987fe462a8c396dbaa6078d1247",
|
||||
"version": "4.2.1",
|
||||
|
|
|
|||
Loading…
Reference in New Issue