uhd: change how we configure version.cpp

use configure_file vs defines,
Possible fix for messaged up dependency/caching issue,
see when changing CMakeLists, even in small ways.

2 files changed, 6 insertions, 7 deletions

diff --git a/host/lib/CMakeLists.txt b/host/lib/CMakeLists.txt
index 60ddbce5b..2b0210e6e 100644
--- a/host/lib/CMakeLists.txt
+++ b/host/lib/CMakeLists.txt
@@ -77,11 +77,10 @@ INCLUDE_SUBDIRECTORY(utils)
 ########################################################################
 # Setup UHD_VERSION_STRING for version.cpp
 ########################################################################
-SET_SOURCE_FILES_PROPERTIES(
+CONFIGURE_FILE(
     ${CMAKE_CURRENT_SOURCE_DIR}/version.cpp
-    PROPERTIES COMPILE_DEFINITIONS
-    "UHD_VERSION_STRING=\"${UHD_VERSION}-${UHD_BUILD_INFO}\""
-)
+    ${CMAKE_CURRENT_BINARY_DIR}/version.cpp
+@ONLY)
 
 ########################################################################
 # Append to the list of sources for lib uhd
@@ -90,7 +89,7 @@ LIBUHD_APPEND_SOURCES(
     ${CMAKE_CURRENT_SOURCE_DIR}/device.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/exception.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/property_tree.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/version.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/version.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/wax.cpp
 )
 
diff --git a/host/lib/version.cpp b/host/lib/version.cpp
index cfd198a08..6925b35bc 100644
--- a/host/lib/version.cpp
+++ b/host/lib/version.cpp
@@ -26,12 +26,12 @@ UHD_STATIC_BLOCK(print_system_info){
         << BOOST_PLATFORM << "; "
         << BOOST_COMPILER << "; "
         << "Boost_" << BOOST_VERSION << "; "
-        << "UHD_" << UHD_VERSION_STRING
+        << "UHD_" << uhd::get_version_string()
         << std::endl << std::endl
     ;
 }
 #endif
 
 std::string uhd::get_version_string(void){
-    return UHD_VERSION_STRING;
+    return "@UHD_VERSION@-@UHD_BUILD_INFO@";
 }