mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-27 22:19:02 +08:00
[ignition-cmake2] bump version to v2.17.1 (#36794)
- [X] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md). - [X] SHA512s are updated for each updated download. - [ ] ~~The "supports" clause reflects platforms that may be fixed by this new version.~~ - [ ] ~~Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) entries are removed from that file.~~ - [X] Any patches that are no longer applied are deleted from the port's directory. - [X] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [X] Only one version is added to each modified port's versions file. Bump version to v2.17.1
This commit is contained in:
parent
07635428f0
commit
4b7e0521fc
@ -1,52 +0,0 @@
|
||||
diff --git a/cmake/FindIgnOGRE.cmake b/cmake/FindIgnOGRE.cmake
|
||||
index e00f619..6825eb2 100644
|
||||
--- a/cmake/FindIgnOGRE.cmake
|
||||
+++ b/cmake/FindIgnOGRE.cmake
|
||||
@@ -99,15 +99,12 @@ if (NOT WIN32)
|
||||
set (OGRE_FOUND false)
|
||||
else ()
|
||||
# set library dirs if the value is empty
|
||||
- if (NOT ${OGRE_LIBRARY_DIRS} OR ${OGRE_LIBRARY_DIRS} STREQUAL "")
|
||||
- execute_process(COMMAND pkg-config --variable=libdir OGRE
|
||||
- OUTPUT_VARIABLE _pkgconfig_invoke_result
|
||||
- RESULT_VARIABLE _pkgconfig_failed)
|
||||
- if(_pkgconfig_failed)
|
||||
+ if (NOT OGRE_LIBRARY_DIRS)
|
||||
+ pkg_get_variable(OGRE_LIBRARY_DIRS OGRE libdir)
|
||||
+ if(NOT OGRE_LIBRARY_DIRS)
|
||||
IGN_BUILD_WARNING ("Failed to find OGRE's library directory. The build will succeed, but there will likely be run-time errors.")
|
||||
else()
|
||||
- # set ogre library dir and strip line break
|
||||
- set(OGRE_LIBRARY_DIRS ${_pkgconfig_invoke_result})
|
||||
+ # strip line break
|
||||
string(REGEX REPLACE "\n$" "" OGRE_LIBRARY_DIRS "${OGRE_LIBRARY_DIRS}")
|
||||
|
||||
string(FIND "${OGRE_LIBRARIES}" "${OGRE_LIBRARY_DIRS}" substr_found)
|
||||
@@ -147,22 +144,18 @@ if (NOT WIN32)
|
||||
endif()
|
||||
endforeach()
|
||||
|
||||
- execute_process(COMMAND pkg-config --variable=plugindir OGRE
|
||||
- OUTPUT_VARIABLE _pkgconfig_invoke_result
|
||||
- RESULT_VARIABLE _pkgconfig_failed)
|
||||
- if(_pkgconfig_failed)
|
||||
+ pkg_get_variable(OGRE_PLUGINDIR OGRE plugindir)
|
||||
+ if(NOT OGRE_PLUGINDIR)
|
||||
IGN_BUILD_WARNING ("Failed to find OGRE's plugin directory. The build will succeed, but there will likely be run-time errors.")
|
||||
else()
|
||||
- # This variable will be substituted into cmake/setup.sh.in
|
||||
- set(OGRE_PLUGINDIR ${_pkgconfig_invoke_result})
|
||||
+ # Seems that OGRE_PLUGINDIR can end in a newline, which will cause problems
|
||||
+ # when we pass it to the compiler later.
|
||||
+ string(REPLACE "\n" "" OGRE_PLUGINDIR ${OGRE_PLUGINDIR})
|
||||
endif()
|
||||
|
||||
ign_pkg_config_library_entry(IgnOGRE OgreMain)
|
||||
|
||||
set(OGRE_RESOURCE_PATH ${OGRE_PLUGINDIR})
|
||||
- # Seems that OGRE_PLUGINDIR can end in a newline, which will cause problems
|
||||
- # when we pass it to the compiler later.
|
||||
- string(REPLACE "\n" "" OGRE_RESOURCE_PATH ${OGRE_RESOURCE_PATH})
|
||||
endif()
|
||||
|
||||
#reset pkg config path
|
@ -1,11 +1,10 @@
|
||||
set(PACKAGE_VERSION "2.16.0")
|
||||
set(PACKAGE_VERSION "2.17.1")
|
||||
|
||||
ignition_modular_library(NAME cmake
|
||||
VERSION ${PACKAGE_VERSION}
|
||||
SHA512 6ee64ff6c82c657678188be459c50a4255fd3881d758906d93361425702d04854a13a46124b20e058069f314077ba7e6c15a058153b615b3245084f066d1cbae
|
||||
SHA512 871a32e9ca5314caa5f25b4135b430e7be829f7afd12ba98ea4524ee758c7ca7ebf64a9e567c6dbc285c497320cd0fe1e69f8d891343b869344726b32dbdc3ee
|
||||
PATCHES
|
||||
add-pkgconfig-and-remove-privatefor-limit.patch
|
||||
fix-findogre-pkgconfig.patch)
|
||||
add-pkgconfig-and-remove-privatefor-limit.patch)
|
||||
|
||||
# Install custom usage
|
||||
configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY)
|
||||
|
@ -1,7 +1,6 @@
|
||||
{
|
||||
"name": "ignition-cmake2",
|
||||
"version": "2.16.0",
|
||||
"port-version": 2,
|
||||
"version": "2.17.1",
|
||||
"description": "CMake helper functions for building robotic applications",
|
||||
"homepage": "https://ignitionrobotics.org/libs/cmake",
|
||||
"license": null,
|
||||
|
@ -3449,8 +3449,8 @@
|
||||
"port-version": 4
|
||||
},
|
||||
"ignition-cmake2": {
|
||||
"baseline": "2.16.0",
|
||||
"port-version": 2
|
||||
"baseline": "2.17.1",
|
||||
"port-version": 0
|
||||
},
|
||||
"ignition-common1": {
|
||||
"baseline": "1.1.1",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "3eb2c4704cd676b655cee082afa275ba9a081c7d",
|
||||
"version": "2.17.1",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "b27712039b4d79cf56407894ede3681292712649",
|
||||
"version": "2.16.0",
|
||||
|
Loading…
Reference in New Issue
Block a user