diff options
| author | Lily <47812810+LilyWangL@users.noreply.github.com> | 2020-09-28 09:59:17 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-27 18:59:17 -0700 |
| commit | 8776756e08dddfc47b209eebfec5c927f14c7c74 (patch) | |
| tree | 500d9652b14ee0ca2867f8def518f414faa68014 | |
| parent | 10d005d01423466de3b2994fd371a9f86ab46edc (diff) | |
| download | vcpkg-8776756e08dddfc47b209eebfec5c927f14c7c74.tar.gz vcpkg-8776756e08dddfc47b209eebfec5c927f14c7c74.zip | |
[libpq] Add conflict error message (#12551)
* [libpq] Add conflict error message
* [decimal-for-cpp] Move header into subdirectory to avoid common-name conflicts
* [libpq] Revert changes
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
| -rw-r--r-- | ports/decimal-for-cpp/CONTROL | 3 | ||||
| -rw-r--r-- | ports/decimal-for-cpp/portfile.cmake | 17 |
2 files changed, 8 insertions, 12 deletions
diff --git a/ports/decimal-for-cpp/CONTROL b/ports/decimal-for-cpp/CONTROL index d1801e22a..9cf6554c4 100644 --- a/ports/decimal-for-cpp/CONTROL +++ b/ports/decimal-for-cpp/CONTROL @@ -1,4 +1,5 @@ Source: decimal-for-cpp -Version:1.16 +Version: 1.16 +Port-Version: 1 Description: Decimal data type support, for COBOL-like fixed-point operations on currency values. diff --git a/ports/decimal-for-cpp/portfile.cmake b/ports/decimal-for-cpp/portfile.cmake index 41af6a158..cbb464ad1 100644 --- a/ports/decimal-for-cpp/portfile.cmake +++ b/ports/decimal-for-cpp/portfile.cmake @@ -1,16 +1,11 @@ -#header-only library - -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO vpiotr/decimal_for_cpp - REF 375633343aa0af812a3ebf4bd06adaeff112ead4 - SHA512 7692fbb1643ed77b0b44fee1cf9a603fa257a5cf64ea66193c571fca61d138c6465a359db21955a4e2a234677f1806d47e05811daf2954004b108e09d3c8d4fa - HEAD_REF master - ) + REPO vpiotr/decimal_for_cpp + REF 375633343aa0af812a3ebf4bd06adaeff112ead4 + SHA512 7692fbb1643ed77b0b44fee1cf9a603fa257a5cf64ea66193c571fca61d138c6465a359db21955a4e2a234677f1806d47e05811daf2954004b108e09d3c8d4fa + HEAD_REF master +) -file(COPY ${SOURCE_PATH}/include/decimal.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(COPY ${SOURCE_PATH}/include/decimal.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/decimal-for-cpp) file(COPY ${SOURCE_PATH}/doc/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/decimal-for-cpp) file(RENAME ${CURRENT_PACKAGES_DIR}/share/decimal-for-cpp/license.txt ${CURRENT_PACKAGES_DIR}/share/decimal-for-cpp/copyright) - |