diff options
| author | Curtis J Bezault <curtbezault@gmail.com> | 2019-08-16 10:23:13 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-16 10:23:13 -0700 |
| commit | a17a013ad8494f705c6286ad24f19c34c38edd86 (patch) | |
| tree | 188e680f9c4051b5a5b053baf4fa5c3a85936c8a | |
| parent | be7428900dbddba629d0761762b24adcd803c021 (diff) | |
| parent | c315a54a950e73c7413728a8e50a24774edc83ba (diff) | |
| download | vcpkg-a17a013ad8494f705c6286ad24f19c34c38edd86.tar.gz vcpkg-a17a013ad8494f705c6286ad24f19c34c38edd86.zip | |
Merge pull request #7697 from wangli28/dev/Lily/issue7682
[geographiclib] Fix build error on Linux
| -rw-r--r-- | ports/geographiclib/CONTROL | 2 | ||||
| -rw-r--r-- | ports/geographiclib/portfile.cmake | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/ports/geographiclib/CONTROL b/ports/geographiclib/CONTROL index 1c4c5a17d..21eeee0c9 100644 --- a/ports/geographiclib/CONTROL +++ b/ports/geographiclib/CONTROL @@ -1,4 +1,4 @@ Source: geographiclib -Version: 1.47-patch1-6 +Version: 1.47-patch1-7 Homepage: https://sourceforge.net/projects/geographiclib/ Description: a small set of C++ classes for performing conversions between geographic, UTM, UPS, MGRS, geocentric, and local cartesian coordinates, for gravity (e.g., EGM2008), geoid height, and geomagnetic field (e.g., WMM2010) calculations, and for solving geodesic problems. diff --git a/ports/geographiclib/portfile.cmake b/ports/geographiclib/portfile.cmake index 8f4a716dc..529e07fcc 100644 --- a/ports/geographiclib/portfile.cmake +++ b/ports/geographiclib/portfile.cmake @@ -46,7 +46,11 @@ endif() vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) +if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) +else() + vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake) +endif() vcpkg_copy_pdbs() file(COPY ${CURRENT_PACKAGES_DIR}/lib/pkgconfig DESTINATION ${CURRENT_PACKAGES_DIR}/share/geographiclib) |