diff options
| -rw-r--r-- | ports/dimcli/CONTROL | 3 | ||||
| -rw-r--r-- | ports/dimcli/portfile.cmake | 28 | ||||
| -rw-r--r-- | ports/log4cplus/CONTROL | 2 | ||||
| -rw-r--r-- | ports/log4cplus/portfile.cmake | 18 | ||||
| -rw-r--r-- | ports/openvr/CONTROL | 2 | ||||
| -rw-r--r-- | ports/openvr/portfile.cmake | 8 | ||||
| -rw-r--r-- | ports/utfcpp/CONTROL | 2 | ||||
| -rw-r--r-- | ports/utfcpp/portfile.cmake | 8 | ||||
| -rw-r--r-- | scripts/ports.cmake | 3 | ||||
| -rw-r--r-- | scripts/templates/portfile.in.cmake | 3 |
10 files changed, 35 insertions, 42 deletions
diff --git a/ports/dimcli/CONTROL b/ports/dimcli/CONTROL index c85457c89..295c1ecda 100644 --- a/ports/dimcli/CONTROL +++ b/ports/dimcli/CONTROL @@ -1,4 +1,3 @@ Source: dimcli -Version: 1.0.3 +Version: 2.0.0 Description: C++ command line parser toolkit - diff --git a/ports/dimcli/portfile.cmake b/ports/dimcli/portfile.cmake index 465e1699e..72097a5f5 100644 --- a/ports/dimcli/portfile.cmake +++ b/ports/dimcli/portfile.cmake @@ -1,28 +1,19 @@ -# Common Ambient Variables: -# VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg> -# TARGET_TRIPLET is the current triplet (x86-windows, etc) -# PORT is the current port name (zlib, etc) -# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} -# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} -# - -set(ver 1.0.3) include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/dimcli-${ver}) -vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/gknowles/dimcli/archive/v${ver}.zip" - FILENAME "dimcli-${ver}.zip" - SHA512 5168aff22223cb85421fabd4ce82f3ec0bcab6551704484bc5b05be02ead23bd3d4a629c558a15f214e9d999eccc9c129649d066fdacfda3c839a40b48f8ec17 -) -vcpkg_extract_source_archive(${ARCHIVE}) +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO gknowles/dimcli + REF v2.0.0 + SHA512 55ff29e3ddd6a96946f58e661231a1d2197f56a86c9260142f083589738aaa5e2f7721c754fa4a86b450a943c19367e1c4f82aec57e5b7ae7336f989e0194dec + HEAD_REF master +) set(staticCrt OFF) if(VCPKG_CRT_LINKAGE STREQUAL static) set(staticCrt ON) endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - OPTIONS -DLINK_STATIC_RUNTIME:BOOL=${staticCrt} + OPTIONS -DLINK_STATIC_RUNTIME:BOOL=${staticCrt} ) vcpkg_install_cmake() @@ -31,7 +22,6 @@ vcpkg_install_cmake() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -file(INSTALL "${SOURCE_PATH}/LICENSE" +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/dimcli" RENAME copyright) - diff --git a/ports/log4cplus/CONTROL b/ports/log4cplus/CONTROL index 2d367a31a..d4af82051 100644 --- a/ports/log4cplus/CONTROL +++ b/ports/log4cplus/CONTROL @@ -1,3 +1,3 @@ Source: log4cplus -Version: 1.1.3-RC7 +Version: REL_1_2_1-RC2 Description: A simple to use C++ logging API providing thread--safe, flexible, and arbitrarily granular control over log management and configuration diff --git a/ports/log4cplus/portfile.cmake b/ports/log4cplus/portfile.cmake index 1eb1a7a59..c1c5de3e2 100644 --- a/ports/log4cplus/portfile.cmake +++ b/ports/log4cplus/portfile.cmake @@ -1,20 +1,26 @@ include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/log4cplus-REL_1_1_3-RC7) -vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/log4cplus/log4cplus/archive/REL_1_1_3-RC7.zip" - FILENAME "REL_1_1_3-RC7.zip" - SHA512 06320cb2ab6e18e91c6d79a943c9fdcd82b984e8e908e232f0e0e8eca69496f1f3845913107218bc2be356473315f8dfb822a5993bab8efcadfc4819532da823 +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO log4cplus/log4cplus + REF REL_1_2_1-RC2 + SHA512 480a2a61b01e988253c1bf2bb26088030541a63811c8ffbb9e90581d556b717df5220e3ff72eedd27ea704af35218f71f20ceadf4d6d94984b4f56d273b4d3a3 + HEAD_REF master ) -vcpkg_extract_source_archive(${ARCHIVE}) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS -DLOG4CPLUS_BUILD_TESTING=OFF -DLOG4CPLUS_BUILD_LOGGINGSERVER=OFF -DWITH_UNIT_TESTS=OFF ) vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake) + +vcpkg_copy_pdbs() + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) # Handle copyright file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/log4cplus) diff --git a/ports/openvr/CONTROL b/ports/openvr/CONTROL index 2a2228ba2..69d7ba966 100644 --- a/ports/openvr/CONTROL +++ b/ports/openvr/CONTROL @@ -1,3 +1,3 @@ Source: openvr -Version: 1.0.5 +Version: 1.0.9 Description: an API and runtime that allows access to VR hardware from multiple vendors without requiring that applications have specific knowledge of the hardware they are targeting. diff --git a/ports/openvr/portfile.cmake b/ports/openvr/portfile.cmake index 94e90143d..50ec79d77 100644 --- a/ports/openvr/portfile.cmake +++ b/ports/openvr/portfile.cmake @@ -7,11 +7,11 @@ # include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openvr-1.0.5) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openvr-1.0.9) vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/ValveSoftware/openvr/archive/v1.0.5.zip" - FILENAME "openvr-v1.0.5.zip" - SHA512 18c2e3f7a8754d0e9389c953d0af70788c77adf43f51d25b6664beaeb407dc8d2daa755396c45ce2b4be1b08d333b378810dbebdf3c9bb5f5a03a9d372dc97b0 + URLS "https://github.com/ValveSoftware/openvr/archive/v1.0.9.zip" + FILENAME "openvr-v1.0.9.zip" + SHA512 969cf6bf94802553bb4f1e5d6a2348566847b3d60efee9d8f83233d1d85e44a870e388028be956950d4f8ecb79f8e0bcf0a6b987b0ab3083060ece5ea48b8fa7 ) vcpkg_extract_source_archive(${ARCHIVE}) diff --git a/ports/utfcpp/CONTROL b/ports/utfcpp/CONTROL index 619e8b2b3..e98dd9ee4 100644 --- a/ports/utfcpp/CONTROL +++ b/ports/utfcpp/CONTROL @@ -1,3 +1,3 @@ Source: utfcpp -Version: 2.3.4 +Version: 2.3.5 Description: UTF-8 with C++ in a Portable Way diff --git a/ports/utfcpp/portfile.cmake b/ports/utfcpp/portfile.cmake index 56599dd3a..19c062f36 100644 --- a/ports/utfcpp/portfile.cmake +++ b/ports/utfcpp/portfile.cmake @@ -1,10 +1,10 @@ #header-only library include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/utfcpp-2.3.4) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/utfcpp-2.3.5) vcpkg_download_distfile(ARCHIVE_FILE - URLS "https://github.com/nemtrif/utfcpp/archive/v2.3.4.tar.gz" - FILENAME "utfcpp-2.3.4.tar.gz" - SHA512 1baa67c4efb926bba97dfbc869ac057d5d6cf67e94879fc0854ec3d75a5bae7c47cb3e9fd9cbc7bed9ca5daf40f173c0349bce2f6aa34a400bdf77d01522ff2f + URLS "https://github.com/nemtrif/utfcpp/archive/v2.3.5.tar.gz" + FILENAME "utfcpp-2.3.5.tar.gz" + SHA512 d5e672de952b78a78a8af0c81664f15667b30558fd406a9abc72c14dc444e0869e7c02cb66fa017ec0e760c0fb23c3e923a4b171c2acb3ed7b71612783e789ee ) vcpkg_extract_source_archive(${ARCHIVE_FILE}) diff --git a/scripts/ports.cmake b/scripts/ports.cmake index 1d699a966..8b4d17d80 100644 --- a/scripts/ports.cmake +++ b/scripts/ports.cmake @@ -32,8 +32,6 @@ endif() if(CMD MATCHES "^BUILD$") - string(REGEX REPLACE "([^-]*)-([^-]*)" "\\1" TRIPLET_SYSTEM_ARCH ${TARGET_TRIPLET}) - set(CMAKE_TRIPLET_FILE ${VCPKG_ROOT_DIR}/triplets/${TARGET_TRIPLET}.cmake) if(NOT EXISTS ${CMAKE_TRIPLET_FILE}) message(FATAL_ERROR "Unsupported target triplet. Triplet file does not exist: ${CMAKE_TRIPLET_FILE}") @@ -70,6 +68,7 @@ if(CMD MATCHES "^BUILD$") file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR} ${CURRENT_PACKAGES_DIR}) include(${CMAKE_TRIPLET_FILE}) + set(TRIPLET_SYSTEM_ARCH ${VCPKG_TARGET_ARCHITECTURE}) include(${CURRENT_PORT_DIR}/portfile.cmake) set(BUILD_INFO_FILE_PATH ${CURRENT_PACKAGES_DIR}/BUILD_INFO) diff --git a/scripts/templates/portfile.in.cmake b/scripts/templates/portfile.in.cmake index bc5f5fe07..e89ad4640 100644 --- a/scripts/templates/portfile.in.cmake +++ b/scripts/templates/portfile.in.cmake @@ -30,5 +30,4 @@ vcpkg_configure_cmake( vcpkg_install_cmake() # Handle copyright -#file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/@PORT@) -#file(RENAME ${CURRENT_PACKAGES_DIR}/share/@PORT@/LICENSE ${CURRENT_PACKAGES_DIR}/share/@PORT@/copyright)
\ No newline at end of file +# file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/@PORT@ RENAME copyright) |