diff options
| author | Michael West <michael.west@ettus.com> | 2013-12-06 17:47:24 -0800 |
|---|---|---|
| committer | Michael West <michael.west@ettus.com> | 2013-12-06 17:47:24 -0800 |
| commit | c3aa7326095a1a8c744e269a04572de74600df8d (patch) | |
| tree | 983711ae9718128617b5f1880f8c6399e38e4055 /images/CMakeLists.txt | |
| parent | aa3d9a9da0405e84e720870a13718b177d85652c (diff) | |
| parent | 8f0f045cdac16ae84bc446b230beb2b651428294 (diff) | |
| download | uhd-c3aa7326095a1a8c744e269a04572de74600df8d.tar.gz uhd-c3aa7326095a1a8c744e269a04572de74600df8d.tar.bz2 uhd-c3aa7326095a1a8c744e269a04572de74600df8d.zip | |
Merge branch 'master' into mwest_coverity
Conflicts:
host/lib/usrp/b200/b200_iface.cpp
Diffstat (limited to 'images/CMakeLists.txt')
| -rw-r--r-- | images/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/images/CMakeLists.txt b/images/CMakeLists.txt index 9a05f11f5..161b5130a 100644 --- a/images/CMakeLists.txt +++ b/images/CMakeLists.txt @@ -43,4 +43,4 @@ MESSAGE(STATUS "Version: ${UHD_VERSION}") #tag the images with a version number (something identifiable) FILE(WRITE ${CMAKE_SOURCE_DIR}/images/${UHD_VERSION_MAJOR}.${UHD_VERSION_MINOR}.${UHD_VERSION_PATCH}.tag "${UHD_VERSION}\n${DATETIME_NOW}\n") INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/images DESTINATION share/uhd) -INSTALL(FILES ${CMAKE_SOURCE_DIR}/../host/LICENSE.txt DESTINATION share/uhd/images) +INSTALL(FILES ${CMAKE_SOURCE_DIR}/../host/LICENSE DESTINATION share/uhd/images) |