diff options
| author | Nicholas Corgan <nick.corgan@ettus.com> | 2013-05-10 15:07:03 -0700 |
|---|---|---|
| committer | Nicholas Corgan <nick.corgan@ettus.com> | 2013-05-10 15:07:03 -0700 |
| commit | 6524f46bc54c36f8d50d6a3aa1c17aafb0a47d75 (patch) | |
| tree | 40a0cf8ec54bae728041d7304ecd841339bace81 /host/include | |
| parent | c6dcb2b4b63841925f4863bc0adbda9b2048475a (diff) | |
| parent | 4b72513a8930ec4147dab76c079afa1186e335cd (diff) | |
| download | uhd-6524f46bc54c36f8d50d6a3aa1c17aafb0a47d75.tar.gz uhd-6524f46bc54c36f8d50d6a3aa1c17aafb0a47d75.tar.bz2 uhd-6524f46bc54c36f8d50d6a3aa1c17aafb0a47d75.zip | |
Merge branch 'maint'
Conflicts:
host/tests/CMakeLists.txt
Diffstat (limited to 'host/include')
| -rw-r--r-- | host/include/uhd/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | host/include/uhd/transport/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | host/include/uhd/types/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | host/include/uhd/usrp/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | host/include/uhd/utils/CMakeLists.txt | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/host/include/uhd/CMakeLists.txt b/host/include/uhd/CMakeLists.txt index 1df04d577..2827cb826 100644 --- a/host/include/uhd/CMakeLists.txt +++ b/host/include/uhd/CMakeLists.txt @@ -1,5 +1,5 @@ -# -# Copyright 2010-2011 Ettus Research LLC + +# Copyright 2010-2011,2013 Ettus Research LLC # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -21,7 +21,7 @@ ADD_SUBDIRECTORY(types) ADD_SUBDIRECTORY(usrp) ADD_SUBDIRECTORY(utils) -INSTALL(FILES +UHD_INSTALL(FILES config.hpp convert.hpp deprecated.hpp diff --git a/host/include/uhd/transport/CMakeLists.txt b/host/include/uhd/transport/CMakeLists.txt index bf7497ee7..1031da817 100644 --- a/host/include/uhd/transport/CMakeLists.txt +++ b/host/include/uhd/transport/CMakeLists.txt @@ -16,7 +16,7 @@ # -INSTALL(FILES +UHD_INSTALL(FILES bounded_buffer.hpp bounded_buffer.ipp buffer_pool.hpp diff --git a/host/include/uhd/types/CMakeLists.txt b/host/include/uhd/types/CMakeLists.txt index 0971ca472..28e646117 100644 --- a/host/include/uhd/types/CMakeLists.txt +++ b/host/include/uhd/types/CMakeLists.txt @@ -16,7 +16,7 @@ # -INSTALL(FILES +UHD_INSTALL(FILES clock_config.hpp device_addr.hpp dict.ipp diff --git a/host/include/uhd/usrp/CMakeLists.txt b/host/include/uhd/usrp/CMakeLists.txt index d7b936fc2..d30a2900a 100644 --- a/host/include/uhd/usrp/CMakeLists.txt +++ b/host/include/uhd/usrp/CMakeLists.txt @@ -16,7 +16,7 @@ # -INSTALL(FILES +UHD_INSTALL(FILES #### dboard headers ### dboard_base.hpp diff --git a/host/include/uhd/utils/CMakeLists.txt b/host/include/uhd/utils/CMakeLists.txt index de91993fe..cdef2e946 100644 --- a/host/include/uhd/utils/CMakeLists.txt +++ b/host/include/uhd/utils/CMakeLists.txt @@ -15,7 +15,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -INSTALL(FILES +UHD_INSTALL(FILES algorithm.hpp assert_has.hpp assert_has.ipp |