From 5a83e8a7e43a6d31b54a1a3dae41e88e04e529a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ken=20A=2E=20Rederg=C3=A5rd?= <64542+kenr@users.noreply.github.com> Date: Thu, 9 May 2019 12:24:42 +0200 Subject: [PATCH] Fix install target copying of SD hex/licence (#238) --- CMakeLists.txt | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 99daa24c3..0acfae109 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -152,9 +152,16 @@ foreach(SD_API_VER ${SD_API_VERS}) string(TOLOWER ${SD_API_VER} SD_API_VER_L) set(CONNECTIVITY_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/hex/${SD_API_VER_L}") - set(HEX_FILE_GLOB "${CONNECTIVITY_DIRECTORY}/connectivity_${CONNECTIVITY_VERSION}*.hex") + set(HEX_FILE_GLOB + "${CONNECTIVITY_DIRECTORY}/connectivity_${CONNECTIVITY_VERSION}*.hex" + "${CONNECTIVITY_DIRECTORY}/*_softdevice.hex" + ) set(DFU_FILE_GLOB "${CONNECTIVITY_DIRECTORY}/connectivity_${CONNECTIVITY_VERSION}*.zip") - set(LICENSE_FILE_GLOB "${CONNECTIVITY_DIRECTORY}/*license-agreement.txt") + + set(LICENSE_FILE_GLOB + "${CONNECTIVITY_DIRECTORY}/*licence-agreement.txt" + "${CONNECTIVITY_DIRECTORY}/*license-agreement.txt" + ) file(GLOB_RECURSE ${SD_API_VER}_HEX_FILES ${HEX_FILE_GLOB}) file(GLOB_RECURSE ${SD_API_VER}_DFU_FILES ${DFU_FILE_GLOB})