-
Notifications
You must be signed in to change notification settings - Fork 6.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[ignition-fuel-tools1] Add new port (#8136)
Add new port for the ignition-fuel-tools version 1, part of the Ignition Robotics Libraries (https://ignitionrobotics.org/).
- Loading branch information
1 parent
2f4cb2d
commit 4afc873
Showing
8 changed files
with
80 additions
and
11 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
diff -r 3276aecbcbb4 -r 33b5d95affd2 cmake/FindIgnCURL.cmake | ||
--- a/cmake/FindIgnCURL.cmake | ||
+++ b/cmake/FindIgnCURL.cmake | ||
@@ -46,6 +46,12 @@ | ||
|
||
# Older versions of curl don't create imported targets, so we will create | ||
# them here if they have not been provided. | ||
+ if(TARGET CURL::libcurl AND NOT TARGET curl::curl) | ||
+ add_library(curl::curl INTERFACE IMPORTED) | ||
+ set_target_properties(curl::curl PROPERTIES | ||
+ INTERFACE_LINK_LIBRARIES CURL::libcurl) | ||
+ endif() | ||
+ | ||
include(IgnImportTarget) | ||
|
||
if(NOT TARGET curl::curl) |
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,4 @@ | ||
Source: ignition-fuel-tools1 | ||
Version: 1.2.0 | ||
Build-Depends: curl, ignition-cmake0, ignition-common1, libyaml, libzip, jsoncpp | ||
Description: Tools for using fuel API to download robot models |
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,24 @@ | ||
diff -r 29939b8a25be -r 8a0a85e63950 CMakeLists.txt | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -9,7 +9,7 @@ | ||
# Find ignition-cmake | ||
#============================================================================ | ||
# If you get an error at this line, you need to install ignition-cmake | ||
-find_package(ignition-cmake0 REQUIRED) | ||
+find_package(ignition-cmake0 0.4.1 REQUIRED) | ||
|
||
#============================================================================ | ||
# Configure the project | ||
diff -r 29939b8a25be -r 8a0a85e63950 src/CMakeLists.txt | ||
--- a/src/CMakeLists.txt | ||
+++ b/src/CMakeLists.txt | ||
@@ -52,7 +52,7 @@ | ||
curl::curl | ||
ignition-common${IGN_COMMON_MAJOR_VER}::ignition-common${IGN_COMMON_MAJOR_VER} | ||
${JSONCPP_TARGET} | ||
- YAML::YAML | ||
+ ${YAML_TARGET} | ||
ZIP::ZIP | ||
) | ||
|
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,10 @@ | ||
include(vcpkg_common_functions) | ||
|
||
include(${CURRENT_INSTALLED_DIR}/share/ignitionmodularscripts/ignition_modular_library.cmake) | ||
|
||
ignition_modular_library(NAME fuel-tools | ||
VERSION "1.2.0" | ||
CMAKE_PACKAGE_NAME ignition-fuel_tools1 | ||
SHA512 5ed8d1429e1f5c0716e06840a4163f7e79a614cf7b6ff326adb69d35639e3ec5f1862edc41c6dc0bd21b16db6d13bee509831a66b10ca2ae3999649f1554a68e | ||
# Ensure yaml is correctly linked (backport of https://bitbucket.org/ignitionrobotics/ign-fuel-tools/pull-requests/103/use-yaml_target-instead-of-yaml-yaml/diff) | ||
PATCHES link-correct-yaml-target.patch) |
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 |
---|---|---|
@@ -1,3 +1,3 @@ | ||
Source: ignition-modularscripts | ||
Version: 2019-08-20 | ||
Version: 2019-09-11 | ||
Description: Vcpkg helpers to package ignition libraries |
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