diff options
author | Steven Koo <steven.koo@ni.com> | 2021-07-30 13:34:34 -0500 |
---|---|---|
committer | Aaron Rossetto <aaron.rossetto@ni.com> | 2021-08-04 15:22:12 -0500 |
commit | 699982eef8b29da7f94fa6d0b8216d660aa8fe40 (patch) | |
tree | d0c48a768d524e007a5da02d33a2d10846aa1732 /host/CMakeLists.txt | |
parent | c0637bae1e4a0ddb996cf2b7eadfad22f782874b (diff) | |
download | uhd-699982eef8b29da7f94fa6d0b8216d660aa8fe40.tar.gz uhd-699982eef8b29da7f94fa6d0b8216d660aa8fe40.tar.bz2 uhd-699982eef8b29da7f94fa6d0b8216d660aa8fe40.zip |
cmake: Fix VS names and use relative for images
cmake has newer variables to identify specific Visual Studio version.
This change updates to use those. This also changes how images
files are globbed to be relative paths, which is useful if build files
are moved from machine to machine. This case is possible in Azure
Pipeline's CI.
Signed-off-by: Steven Koo <steven.koo@ni.com>
Diffstat (limited to 'host/CMakeLists.txt')
-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 fc91ef441..3d60fa833 100644 --- a/host/CMakeLists.txt +++ b/host/CMakeLists.txt @@ -536,7 +536,7 @@ UHD_INSTALL( ######################################################################## if(DEFINED UHD_IMAGES_SRC_DIR AND EXISTS "${UHD_IMAGES_SRC_DIR}") message(STATUS "Reading images from directory `${UHD_IMAGES_SRC_DIR}'") - file(GLOB_RECURSE _image_files "${UHD_IMAGES_SRC_DIR}/*") + file(GLOB_RECURSE _image_files RELATIVE "${CMAKE_SOURCE_DIR}" "${UHD_IMAGES_SRC_DIR}/*") message(STATUS "These images files will be installed/packaged:") foreach(_img ${_image_files}) message(STATUS " ${_img}") |