diff options
| author | Silvio Traversaro <silvio.traversaro@iit.it> | 2019-09-26 21:03:56 +0200 |
|---|---|---|
| committer | Curtis J Bezault <curtbezault@gmail.com> | 2019-09-26 12:03:56 -0700 |
| commit | 4afc873253cbcf46c4418dde3d017cf1cfdfdd71 (patch) | |
| tree | d100e68a49ff70e3cfa158dfea2252574ed727e9 /ports/ignition-cmake0 | |
| parent | 2f4cb2d5be72ab6f40a2a5fc68f8c03a5fa1e8fd (diff) | |
| download | vcpkg-4afc873253cbcf46c4418dde3d017cf1cfdfdd71.tar.gz vcpkg-4afc873253cbcf46c4418dde3d017cf1cfdfdd71.zip | |
[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/).
Diffstat (limited to 'ports/ignition-cmake0')
| -rw-r--r-- | ports/ignition-cmake0/CONTROL | 2 | ||||
| -rw-r--r-- | ports/ignition-cmake0/fix-find-ign-curl.patch | 16 | ||||
| -rw-r--r-- | ports/ignition-cmake0/portfile.cmake | 2 |
3 files changed, 19 insertions, 1 deletions
diff --git a/ports/ignition-cmake0/CONTROL b/ports/ignition-cmake0/CONTROL index 5f427ffef..f4eea840b 100644 --- a/ports/ignition-cmake0/CONTROL +++ b/ports/ignition-cmake0/CONTROL @@ -1,5 +1,5 @@ Source: ignition-cmake0
-Version: 0.6.2
+Version: 0.6.2-1
Homepage: https://ignitionrobotics.org/libs/cmake
Description: CMake helper functions for building robotic applications
Build-Depends: ignition-modularscripts
diff --git a/ports/ignition-cmake0/fix-find-ign-curl.patch b/ports/ignition-cmake0/fix-find-ign-curl.patch new file mode 100644 index 000000000..9189712d2 --- /dev/null +++ b/ports/ignition-cmake0/fix-find-ign-curl.patch @@ -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) diff --git a/ports/ignition-cmake0/portfile.cmake b/ports/ignition-cmake0/portfile.cmake index fc85e8335..c835238df 100644 --- a/ports/ignition-cmake0/portfile.cmake +++ b/ports/ignition-cmake0/portfile.cmake @@ -14,6 +14,8 @@ ignition_modular_library(NAME cmake support-arm64.patch
# Do not depend on pkg-config installed to find uuid
uuid-do-not-require-pkg-config.patch
+ # Fix FindIgnCURL.cmake (backport of https://bitbucket.org/ignitionrobotics/ign-cmake/pull-requests/175)
+ fix-find-ign-curl.patch
)
# Permit empty include folder
|