diff options
| author | Nicholas Corgan <nick.corgan@ettus.com> | 2013-10-23 14:23:35 -0700 |
|---|---|---|
| committer | Nicholas Corgan <nick.corgan@ettus.com> | 2013-10-23 14:23:35 -0700 |
| commit | 95236a2bde3e63b49f2b7c4e19fdb32b195742f0 (patch) | |
| tree | 1a67ff60f36e44efbdcd32553ed4bcc5867183d1 /host | |
| parent | de4ce9ea2858045f01ac34d1eba71e14f46ca858 (diff) | |
| parent | f3b27b87ad49baf4696f3a62fb25dbdea9630f37 (diff) | |
| download | uhd-95236a2bde3e63b49f2b7c4e19fdb32b195742f0.tar.gz uhd-95236a2bde3e63b49f2b7c4e19fdb32b195742f0.tar.bz2 uhd-95236a2bde3e63b49f2b7c4e19fdb32b195742f0.zip | |
Merge branch 'maint'
Conflicts:
host/CMakeLists.txt
Diffstat (limited to 'host')
| -rw-r--r-- | host/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt index e4d2ea043..c07520e8b 100644 --- a/host/CMakeLists.txt +++ b/host/CMakeLists.txt @@ -285,7 +285,7 @@ ENDIF(NOT LIBUHD_PKG AND NOT UHDHOST_PKG) # Handle pre-built images ######################################################################## IF(DEFINED UHD_IMAGES_DIR AND EXISTS "${UHD_IMAGES_DIR}") - FILE(GLOB _image_files "${UHD_IMAGES_DIR}/*.*") + FILE(GLOB_RECURSE _image_files "${UHD_IMAGES_DIR}/*") MESSAGE(STATUS "Using images:") FOREACH(_img ${_image_files}) MESSAGE(STATUS " ${_img}") |