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/eigen3 | |
| 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/eigen3')
| -rw-r--r-- | ports/eigen3/CONTROL | 2 | ||||
| -rw-r--r-- | ports/eigen3/portfile.cmake | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/ports/eigen3/CONTROL b/ports/eigen3/CONTROL index b612dc881..f76900517 100644 --- a/ports/eigen3/CONTROL +++ b/ports/eigen3/CONTROL @@ -1,4 +1,4 @@ Source: eigen3 -Version: 3.3.7-4 +Version: 3.3.7-5 Homepage: http://eigen.tuxfamily.org Description: C++ template library for linear algebra: matrices, vectors, numerical solvers, and related algorithms. diff --git a/ports/eigen3/portfile.cmake b/ports/eigen3/portfile.cmake index ad8779e75..85b429558 100644 --- a/ports/eigen3/portfile.cmake +++ b/ports/eigen3/portfile.cmake @@ -16,20 +16,25 @@ vcpkg_configure_cmake( PREFER_NINJA OPTIONS -DBUILD_TESTING=OFF + -DEIGEN_BUILD_PKGCONFIG=ON OPTIONS_RELEASE -DCMAKEPACKAGE_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/share/eigen3 + -DPKGCONFIG_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/lib/pkgconfig OPTIONS_DEBUG -DCMAKEPACKAGE_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/debug/share/eigen3 + -DPKGCONFIG_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig ) vcpkg_install_cmake() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) file(READ "${CURRENT_PACKAGES_DIR}/share/eigen3/Eigen3Targets.cmake" EIGEN_TARGETS) string(REPLACE "set(_IMPORT_PREFIX " "get_filename_component(_IMPORT_PREFIX \"\${CMAKE_CURRENT_LIST_DIR}/../..\" ABSOLUTE) #" EIGEN_TARGETS "${EIGEN_TARGETS}") file(WRITE "${CURRENT_PACKAGES_DIR}/share/eigen3/Eigen3Targets.cmake" "${EIGEN_TARGETS}") +vcpkg_fixup_pkgconfig() + file(GLOB INCLUDES ${CURRENT_PACKAGES_DIR}/include/eigen3/*) # Copy the eigen header files to conventional location for user-wide MSBuild integration file(COPY ${INCLUDES} DESTINATION ${CURRENT_PACKAGES_DIR}/include) |