diff options
| author | Brent Stapleton <brent.stapleton@ettus.com> | 2018-01-25 10:53:51 -0800 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2018-01-29 11:34:48 +0100 |
| commit | cf1bf696649c958c53d7f4cf0a280242c254e4be (patch) | |
| tree | e3d68a2a733d61270bb3f4d0a79a6063075f6b95 | |
| parent | 8f5f38e4f98a30ab88729ac52105a4d0f4e928a9 (diff) | |
| download | uhd-cf1bf696649c958c53d7f4cf0a280242c254e4be.tar.gz uhd-cf1bf696649c958c53d7f4cf0a280242c254e4be.tar.bz2 uhd-cf1bf696649c958c53d7f4cf0a280242c254e4be.zip | |
utils: images downloader: forced update of CMake variable
Moved the uhd_images_downloader.py.in configuration to its own script
so that the manifest file is added as a dependency and read into a
CMake variable.
Reviewed-by: Ashish Chaudhari <ashish@ettus.com>
Reviewed-by: Martin Braun <martin.braun@ettus.com>
| -rw-r--r-- | host/cmake/Modules/UHDImagesDownloader.cmake | 6 | ||||
| -rw-r--r-- | host/utils/CMakeLists.txt | 15 |
2 files changed, 16 insertions, 5 deletions
diff --git a/host/cmake/Modules/UHDImagesDownloader.cmake b/host/cmake/Modules/UHDImagesDownloader.cmake new file mode 100644 index 000000000..63c5ded75 --- /dev/null +++ b/host/cmake/Modules/UHDImagesDownloader.cmake @@ -0,0 +1,6 @@ +#UHD images downloader configuration +FILE(READ ${CURRENT_DIR}/../../images/manifest.txt CMAKE_MANIFEST_CONTENTS) +CONFIGURE_FILE( + ${CURRENT_DIR}/uhd_images_downloader.py.in + ${INSTALL_DIR}/uhd_images_downloader.py +@ONLY) diff --git a/host/utils/CMakeLists.txt b/host/utils/CMakeLists.txt index 6ecfb4ba3..4ca33c2ba 100644 --- a/host/utils/CMakeLists.txt +++ b/host/utils/CMakeLists.txt @@ -121,11 +121,16 @@ IF(ENABLE_X300) ENDIF(ENABLE_X300) #UHD images downloader configuration -FILE(READ ${CMAKE_CURRENT_SOURCE_DIR}/../../images/manifest.txt CMAKE_MANIFEST_CONTENTS) -CONFIGURE_FILE( - ${CMAKE_CURRENT_SOURCE_DIR}/uhd_images_downloader.py.in - ${CMAKE_CURRENT_BINARY_DIR}/uhd_images_downloader.py -@ONLY) +ADD_CUSTOM_TARGET(images_downloader ALL + COMMAND + ${CMAKE_COMMAND} + -DCURRENT_DIR=${CMAKE_CURRENT_SOURCE_DIR} + -DINSTALL_DIR=${CMAKE_CURRENT_BINARY_DIR} + -P ${CMAKE_SOURCE_DIR}/cmake/Modules/UHDImagesDownloader.cmake + DEPENDS + ${CMAKE_CURRENT_SOURCE_DIR}/uhd_images_downloader.py.in + ${CMAKE_CURRENT_SOURCE_DIR}/../../images/manifest.txt +) UHD_INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/uhd_images_downloader.py DESTINATION ${PKG_LIB_DIR}/utils |