51 lines
2.5 KiB
Diff
51 lines
2.5 KiB
Diff
diff -urN ignition-fuel-tools-4.5.0.orig/bitbucket-pipelines.yml ignition-fuel-tools-4.5.0/bitbucket-pipelines.yml
|
|
--- ignition-fuel-tools-4.5.0.orig/bitbucket-pipelines.yml 2024-08-02 10:10:05.293215536 +0800
|
|
+++ ignition-fuel-tools-4.5.0/bitbucket-pipelines.yml 2024-06-26 05:08:31.000000000 +0800
|
|
@@ -16,7 +16,7 @@
|
|
git libcurl4-openssl-dev libjsoncpp-dev libzip-dev libgflags-dev libtinyxml2-dev
|
|
lcov curl libyaml-dev
|
|
libignition-cmake2-dev
|
|
- libignition-common3-dev
|
|
+ libignition-common4-dev
|
|
libignition-math6-dev
|
|
libignition-msgs5-dev
|
|
# Ignition tools
|
|
diff -urN ignition-fuel-tools-4.5.0.orig/CMakeLists.txt ignition-fuel-tools-4.5.0/CMakeLists.txt
|
|
--- ignition-fuel-tools-4.5.0.orig/CMakeLists.txt 2024-08-02 10:10:05.292215531 +0800
|
|
+++ ignition-fuel-tools-4.5.0/CMakeLists.txt 2024-06-20 02:26:04.000000000 +0800
|
|
@@ -47,8 +47,8 @@
|
|
|
|
#--------------------------------------
|
|
# Find ignition-common
|
|
-ign_find_package(ignition-common3 REQUIRED PRIVATE)
|
|
-set(IGN_COMMON_MAJOR_VER ${ignition-common3_VERSION_MAJOR})
|
|
+ign_find_package(ignition-common4 REQUIRED PRIVATE)
|
|
+set(IGN_COMMON_MAJOR_VER ${ignition-common4_VERSION_MAJOR})
|
|
|
|
#--------------------------------------
|
|
# Find ignition-math
|
|
diff -urN ignition-fuel-tools-4.5.0.orig/configure.bat ignition-fuel-tools-4.5.0/configure.bat
|
|
--- ignition-fuel-tools-4.5.0.orig/configure.bat 2024-08-02 10:10:05.293215536 +0800
|
|
+++ ignition-fuel-tools-4.5.0/configure.bat 2024-06-26 05:08:06.000000000 +0800
|
|
@@ -10,7 +10,7 @@
|
|
call %win_lib% :download_unzip_install libzip-1.4.0_zlip-1.2.11_vc15-x64-dll-MD.zip
|
|
call %win_lib% :install_ign_project ign-cmake ign-cmake2
|
|
call %win_lib% :install_ign_project ign-tools ign-tools1
|
|
-call %win_lib% :install_ign_project ign-common ign-common3
|
|
+call %win_lib% :install_ign_project ign-common ign-common4
|
|
call %win_lib% :install_ign_project ign-msgs ign-msgs5
|
|
|
|
:: Set configuration variables
|
|
diff -urN ignition-fuel-tools-4.5.0.orig/src/Zip_TEST.cc ignition-fuel-tools-4.5.0/src/Zip_TEST.cc
|
|
--- ignition-fuel-tools-4.5.0.orig/src/Zip_TEST.cc 2024-08-02 10:10:05.292215531 +0800
|
|
+++ ignition-fuel-tools-4.5.0/src/Zip_TEST.cc 2024-06-26 05:07:37.000000000 +0800
|
|
@@ -16,7 +16,7 @@
|
|
*/
|
|
|
|
// All these helper functions have been copied from
|
|
-// https://github.com/ignitionrobotics/ign-common/raw/ign-common3/src/Filesystem_TEST.cc
|
|
+// https://github.com/ignitionrobotics/ign-common/raw/ign-common4/src/Filesystem_TEST.cc
|
|
|
|
#ifndef _WIN32
|
|
#include <fcntl.h>
|