diff options
| author | Silvio Traversaro <silvio.traversaro@iit.it> | 2020-05-12 00:57:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-11 15:57:50 -0700 |
| commit | 09b769bf5e8d88efd5a3d062a5144d5bf850c8a6 (patch) | |
| tree | fff4663895046688be7bc8a9b387b6b2b6a66fda /ports/ignition-fuel-tools1 | |
| parent | a64cf52dd52a001957a5e6e315cdf7188c2842ca (diff) | |
| download | vcpkg-09b769bf5e8d88efd5a3d062a5144d5bf850c8a6.tar.gz vcpkg-09b769bf5e8d88efd5a3d062a5144d5bf850c8a6.zip | |
[eigen3] [ignition-modularscripts] Fix installed pkgconfig files (#11270)
* [eigen3] Fix generated pkgconfig files
* [ignition-cmake2] Update to C++ library
Now ignition-cmake also installs a C++ library, so
it is possible to remove code specific for CMake-only ports.
* [ignition-modularscripts] Fix pkgconfig files installed by ignition libraries
Use the new function vcpkg_fixup_pkgconfig to fix the installed .pc pkgconfig files
of the ignition libraries.
As ignition-fuel-tools1 depends on curl that has a broken pkg-config file, disable
installation of its pkg-config files.
Diffstat (limited to 'ports/ignition-fuel-tools1')
| -rw-r--r-- | ports/ignition-fuel-tools1/CONTROL | 2 | ||||
| -rw-r--r-- | ports/ignition-fuel-tools1/portfile.cmake | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/ports/ignition-fuel-tools1/CONTROL b/ports/ignition-fuel-tools1/CONTROL index 51909da8a..acabd13df 100644 --- a/ports/ignition-fuel-tools1/CONTROL +++ b/ports/ignition-fuel-tools1/CONTROL @@ -1,4 +1,4 @@ Source: ignition-fuel-tools1 -Version: 1.2.0-1 +Version: 1.2.0-2 Build-Depends: curl, ignition-cmake0, ignition-common1, libyaml, libzip, jsoncpp Description: Tools for using fuel API to download robot models diff --git a/ports/ignition-fuel-tools1/portfile.cmake b/ports/ignition-fuel-tools1/portfile.cmake index 1d87aef59..c7c310294 100644 --- a/ports/ignition-fuel-tools1/portfile.cmake +++ b/ports/ignition-fuel-tools1/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - include(${CURRENT_INSTALLED_DIR}/share/ignitionmodularscripts/ignition_modular_library.cmake) ignition_modular_library(NAME fuel-tools @@ -7,4 +5,7 @@ ignition_modular_library(NAME fuel-tools CMAKE_PACKAGE_NAME ignition-fuel_tools1 SHA512 a656fed74fb2138b3bcf7d35b25ad06da95cfb9a3ad7ded2c9c54db385f55ea310fd1a72dcf6400b0a6199e376c1ba2d11ee2a08c66e3c2cc8b2ee1b25406986 # 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) + PATCHES link-correct-yaml-target.patch + # This can be removed when the pc file of curl is fixed + DISABLE_PKGCONFIG_INSTALL + ) |