aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen A. RedergÄrd <64542+kenr@users.noreply.github.com>2020-07-15 23:20:50 +0200
committerGitHub <noreply@github.com>2020-07-15 14:20:50 -0700
commit38e1a6465beeb7b294a584d1c4ec24b2daab2670 (patch)
tree02fa2fa32c799e61682f7d78cac0b921021c3d4a
parent23957929ba8df18a6342aa5f8924507b73b149c7 (diff)
downloadvcpkg-38e1a6465beeb7b294a584d1c4ec24b2daab2670.tar.gz
vcpkg-38e1a6465beeb7b294a584d1c4ec24b2daab2670.zip
[nrf-ble-driver] Update to v4.1.2 (#12436)
* Update to nrf-ble-driver-4.1.2 * Update source code hash * Copy .hex/.zip files to package install directory
-rw-r--r--ports/nrf-ble-driver/CONTROL4
-rw-r--r--ports/nrf-ble-driver/portfile.cmake13
2 files changed, 12 insertions, 5 deletions
diff --git a/ports/nrf-ble-driver/CONTROL b/ports/nrf-ble-driver/CONTROL
index b148716a9..fa530b044 100644
--- a/ports/nrf-ble-driver/CONTROL
+++ b/ports/nrf-ble-driver/CONTROL
@@ -1,4 +1,4 @@
Source: nrf-ble-driver
-Version: 4.1.1-2
+Version: 4.1.2
Description: BLE driver is a library for Bluetooth Low Energy communication using Nordic Semiconductor development kits.
-Build-Depends: asio, catch2
+Build-Depends: spdlog, catch2, cli11, asio
diff --git a/ports/nrf-ble-driver/portfile.cmake b/ports/nrf-ble-driver/portfile.cmake
index 3594b7c3a..447f9065c 100644
--- a/ports/nrf-ble-driver/portfile.cmake
+++ b/ports/nrf-ble-driver/portfile.cmake
@@ -11,8 +11,8 @@ endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO NordicSemiconductor/pc-ble-driver
- REF v4.1.1
- SHA512 bb1853993b3f37836a8f7402e5c0452e8423c3a1c6e651cf353025022a32e16c72f06e2266e283c72fa7ddb0da7cf8cecb875a7a7762565599f2908c4858ce8e
+ REF v4.1.2
+ SHA512 625a52151f2c78421e48e90ff60292c6106e8504b55a26c7df716df75e051a40d2ee4a26c57b5daaa370e53a79002fe965aee8a0d8749f7dce380e8e4a617c95
HEAD_REF master
PATCHES
001-arm64-support.patch
@@ -28,13 +28,20 @@ set(ENV{PATH} "$ENV{PATH};${GIT_EXE_DIRPATH}")
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
- OPTIONS -DDISABLE_EXAMPLES= -DDISABLE_TESTS= -DNRF_BLE_DRIVER_VERSION=4.1.1 -DCONNECTIVITY_VERSION=4.1.1
+ OPTIONS -DDISABLE_EXAMPLES= -DDISABLE_TESTS= -DNRF_BLE_DRIVER_VERSION=4.1.2 -DCONNECTIVITY_VERSION=4.1.2
)
vcpkg_install_cmake()
vcpkg_copy_pdbs()
vcpkg_fixup_cmake_targets()
+# Copy hex files into shared folder for package
+foreach(HEX_DIR IN ITEMS "sd_api_v2" "sd_api_v3" "sd_api_v5" "sd_api_v6")
+ set(TARGET_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}/hex/${HEX_DIR}")
+ file(MAKE_DIRECTORY ${TARGET_DIRECTORY})
+ file(INSTALL "${SOURCE_PATH}/hex/${HEX_DIR}" DESTINATION ${TARGET_DIRECTORY}/..)
+endforeach()
+
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/LICENSE)