From cf1bf696649c958c53d7f4cf0a280242c254e4be Mon Sep 17 00:00:00 2001
From: Brent Stapleton <brent.stapleton@ettus.com>
Date: Thu, 25 Jan 2018 10:53:51 -0800
Subject: 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>
---
 host/cmake/Modules/UHDImagesDownloader.cmake |  6 ++++++
 host/utils/CMakeLists.txt                    | 15 ++++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 host/cmake/Modules/UHDImagesDownloader.cmake

(limited to 'host')

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
-- 
cgit v1.2.3