aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLily <47812810+LilyWangL@users.noreply.github.com>2019-12-21 04:17:18 +0800
committerdan-shaw <51385773+dan-shaw@users.noreply.github.com>2019-12-20 12:17:18 -0800
commit386d5c9509e0be812af4178461817dae0e48be4f (patch)
treef6a4187f88088ad852db3997cb01d79544430476
parentac0d90f680fb0431b4d5e472a1952ea06944c50b (diff)
downloadvcpkg-386d5c9509e0be812af4178461817dae0e48be4f.tar.gz
vcpkg-386d5c9509e0be812af4178461817dae0e48be4f.zip
[geotrans] Add macro LITTLE_ENDIAN (#9217)
-rw-r--r--ports/geotrans/CMakeLists.txt3
-rw-r--r--ports/geotrans/CONTROL2
-rw-r--r--ports/geotrans/portfile.cmake8
3 files changed, 7 insertions, 6 deletions
diff --git a/ports/geotrans/CMakeLists.txt b/ports/geotrans/CMakeLists.txt
index ba2af5868..f733f8c8a 100644
--- a/ports/geotrans/CMakeLists.txt
+++ b/ports/geotrans/CMakeLists.txt
@@ -95,6 +95,9 @@ include/dtcc/CoordinateSystems/usng
include/dtcc/CoordinateTuples
)
+if(WIN32)
+ add_definitions(-DLITTLE_ENDIAN)
+endif()
add_library(MSPdtcc ${DTCC_CPP})
add_library(MSPCoordinateConversionService CCS/src/CoordinateConversion/CoordinateConversionService.cpp ${DTCC_CPP})
diff --git a/ports/geotrans/CONTROL b/ports/geotrans/CONTROL
index 1d3373aae..4d04091f5 100644
--- a/ports/geotrans/CONTROL
+++ b/ports/geotrans/CONTROL
@@ -1,3 +1,3 @@
Source: geotrans
-Version: 3.7
+Version: 3.7-1
Description: Geotrans is a library that allows you convert geographic coordinates among a wide variety of coordinate systems, map projections, and datums.
diff --git a/ports/geotrans/portfile.cmake b/ports/geotrans/portfile.cmake
index 4b63ba58a..d2b4104bd 100644
--- a/ports/geotrans/portfile.cmake
+++ b/ports/geotrans/portfile.cmake
@@ -1,5 +1,3 @@
-include(vcpkg_common_functions)
-
set(VCPKG_LIBRARY_LINKAGE "dynamic")
# We specify the Linux URL, but the only difference between the Windows/Linux packages are the included libraries
@@ -27,7 +25,7 @@ vcpkg_install_cmake()
configure_file(
${CMAKE_CURRENT_LIST_DIR}/geotrans-config.in.cmake
- ${CURRENT_PACKAGES_DIR}/share/geotrans/geotrans-config.cmake
+ ${CURRENT_PACKAGES_DIR}/share/${PORT}/geotrans-config.cmake
@ONLY
)
@@ -35,7 +33,7 @@ configure_file(${CMAKE_CURRENT_LIST_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/${P
# Handle copyright
-file(INSTALL ${SOURCE_PATH}/GEOTRANS3/docs/MSP_Geotrans_Terms_Of_Use.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/geotrans 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/geotrans)
+file(COPY ${SOURCE_PATH}/data DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})