Skip to content

Commit

Permalink
[geotrans] no absolute paths (#28177)
Browse files Browse the repository at this point in the history
  • Loading branch information
autoantwort authored Dec 6, 2022
1 parent bbf8901 commit 3414a89
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 17 deletions.
25 changes: 12 additions & 13 deletions ports/geotrans/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -8,30 +8,29 @@ vcpkg_download_distfile(ARCHIVE
SHA512 359704ee9700762111006d126872feab9f644af0cebd433a657473347ea48f4eb172681f5f564fbca171bbf58fe0e8fb0829597403958770b7d22ad380afeac3
)

vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH
ARCHIVE ${ARCHIVE}
vcpkg_extract_source_archive(
SOURCE_PATH
ARCHIVE "${ARCHIVE}"
)

file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
)

vcpkg_install_cmake()
vcpkg_cmake_install()

configure_file(
${CMAKE_CURRENT_LIST_DIR}/geotrans-config.in.cmake
${CURRENT_PACKAGES_DIR}/share/${PORT}/geotrans-config.cmake
"${CMAKE_CURRENT_LIST_DIR}/geotrans-config.in.cmake"
"${CURRENT_PACKAGES_DIR}/share/${PORT}/geotrans-config.cmake"
@ONLY
)

configure_file(${CMAKE_CURRENT_LIST_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/${PORT} @ONLY)
configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}" @ONLY)

# Handle copyright
file(INSTALL ${SOURCE_PATH}/GEOTRANS3/docs/MSP_Geotrans_Terms_Of_Use.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL "${SOURCE_PATH}/GEOTRANS3/docs/MSP_Geotrans_Terms_Of_Use.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

# Install the geo model data
file(COPY ${SOURCE_PATH}/data DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
file(COPY "${SOURCE_PATH}/data" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
2 changes: 1 addition & 1 deletion ports/geotrans/usage
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ The package geotrans provides CMake targets:
The geotrans library depends on being able to read it's model data so you'll need to
set an environment variable to let geotrans know where the models are installed:

export MSPCCS_DATA=@CURRENT_INSTALLED_DIR@/share/@PORT@/data
export MSPCCS_DATA=<path_to_vcpkg_installed>/share/@PORT@/data

11 changes: 9 additions & 2 deletions ports/geotrans/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
{
"name": "geotrans",
"version": "3.8",
"port-version": 1,
"port-version": 2,
"description": "GEOTRANS is an application that allows you to convert geographic coordinates among a wide variety of coordinate systems, map projections, grids, and datums. GEOTRANS runs in Microsoft Windows and LINUX environments.",
"homepage": "https://earth-info.nga.mil/GandG/update/index.php?action=home",
"supports": "!uwp"
"license": null,
"supports": "!uwp",
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
}
]
}
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -2582,7 +2582,7 @@
},
"geotrans": {
"baseline": "3.8",
"port-version": 1
"port-version": 2
},
"getdns": {
"baseline": "1.7.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/g-/geotrans.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "ed816520f117cff22add4e76969c0769f9655d43",
"version": "3.8",
"port-version": 2
},
{
"git-tree": "f9b1a18f0cadf69936ab62911f4d86fdb565c693",
"version": "3.8",
Expand Down

0 comments on commit 3414a89

Please sign in to comment.