Merge branch 'master' into release/4.1-compiled-connectivity

NordicSemiconductor · May 9, 2019 · 0c7653f · 0c7653f
2 parents c54bab1 + 5a83e8a
commit 0c7653f
Showing 1 changed file with 9 additions and 2 deletions.
diff --git 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})