diff options
| author | Trung N Tran <trung.tran@ettus.com> | 2018-02-26 12:21:43 -0800 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2018-02-27 12:13:06 -0800 |
| commit | 82100306d0b7ba6c7483853c3e7bcc54619eae8e (patch) | |
| tree | 52247e2dc152e6baf203b22171073761f4349040 | |
| parent | 49734e4fdb075f1d0a9ed457b4e1412159e11b3b (diff) | |
| download | uhd-82100306d0b7ba6c7483853c3e7bcc54619eae8e.tar.gz uhd-82100306d0b7ba6c7483853c3e7bcc54619eae8e.tar.bz2 uhd-82100306d0b7ba6c7483853c3e7bcc54619eae8e.zip | |
Revert "utils: images downloader: forced update of CMake variable"
This reverts commit cf1bf696649c958c53d7f4cf0a280242c254e4be.
| -rw-r--r-- | host/cmake/Modules/UHDImagesDownloader.cmake | 6 | ||||
| -rw-r--r-- | host/utils/CMakeLists.txt | 15 |
2 files changed, 5 insertions, 16 deletions
diff --git a/host/cmake/Modules/UHDImagesDownloader.cmake b/host/cmake/Modules/UHDImagesDownloader.cmake deleted file mode 100644 index 63c5ded75..000000000 --- a/host/cmake/Modules/UHDImagesDownloader.cmake +++ /dev/null @@ -1,6 +0,0 @@ -#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 d71a71740..9f92b244c 100644 --- a/host/utils/CMakeLists.txt +++ b/host/utils/CMakeLists.txt @@ -122,16 +122,11 @@ IF(ENABLE_X300) ENDIF(ENABLE_X300) #UHD images downloader configuration -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 -) +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) UHD_INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/uhd_images_downloader.py DESTINATION ${PKG_LIB_DIR}/utils |