diff options
| -rw-r--r-- | lib/CMakeLists.txt | 15 | ||||
| -rw-r--r-- | lib/transport/CMakeLists.txt | 21 | ||||
| -rw-r--r-- | lib/usrp/CMakeLists.txt | 27 | ||||
| -rw-r--r-- | lib/usrp/dboard/CMakeLists.txt | 25 | ||||
| -rw-r--r-- | lib/usrp/mboard/CMakeLists.txt | 23 |
5 files changed, 10 insertions, 101 deletions
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 6150fd574..049236016 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -16,9 +16,6 @@ # -ADD_SUBDIRECTORY(usrp) -ADD_SUBDIRECTORY(transport) - ADD_LIBRARY(uhd SHARED device.cpp device_addr.cpp @@ -26,10 +23,18 @@ ADD_LIBRARY(uhd SHARED shared_iovec.cpp uhd.cpp wax.cpp + transport/udp.cpp + usrp/usrp.cpp + usrp/dboard/basic.cpp + usrp/dboard/base.cpp + usrp/dboard/id.cpp + usrp/dboard/interface.cpp + usrp/dboard/manager.cpp + usrp/mboard/base.cpp + usrp/mboard/test.cpp + usrp/mboard/usrp2.cpp ) -TARGET_LINK_LIBRARIES(uhd uhd_usrp) -TARGET_LINK_LIBRARIES(uhd uhd_transport) TARGET_LINK_LIBRARIES(uhd ${Boost_LIBRARIES}) INSTALL(TARGETS uhd LIBRARY DESTINATION ${LIBRARY_DIR}) diff --git a/lib/transport/CMakeLists.txt b/lib/transport/CMakeLists.txt deleted file mode 100644 index e633fa8f4..000000000 --- a/lib/transport/CMakeLists.txt +++ /dev/null @@ -1,21 +0,0 @@ -# -# Copyright 2010 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 -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# - - -ADD_LIBRARY(uhd_transport STATIC - udp.cpp -) diff --git a/lib/usrp/CMakeLists.txt b/lib/usrp/CMakeLists.txt deleted file mode 100644 index 2f96fd349..000000000 --- a/lib/usrp/CMakeLists.txt +++ /dev/null @@ -1,27 +0,0 @@ -# -# Copyright 2010 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 -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# - - -ADD_SUBDIRECTORY(dboard) -ADD_SUBDIRECTORY(mboard) - -ADD_LIBRARY(uhd_usrp STATIC - usrp.cpp -) - -TARGET_LINK_LIBRARIES(uhd_usrp uhd_usrp_dboard) -TARGET_LINK_LIBRARIES(uhd_usrp uhd_usrp_mboard) diff --git a/lib/usrp/dboard/CMakeLists.txt b/lib/usrp/dboard/CMakeLists.txt deleted file mode 100644 index 128def095..000000000 --- a/lib/usrp/dboard/CMakeLists.txt +++ /dev/null @@ -1,25 +0,0 @@ -# -# Copyright 2010 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 -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# - - -ADD_LIBRARY(uhd_usrp_dboard STATIC - basic.cpp - base.cpp - id.cpp - interface.cpp - manager.cpp -) diff --git a/lib/usrp/mboard/CMakeLists.txt b/lib/usrp/mboard/CMakeLists.txt deleted file mode 100644 index a6ba1f687..000000000 --- a/lib/usrp/mboard/CMakeLists.txt +++ /dev/null @@ -1,23 +0,0 @@ -# -# Copyright 2010 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 -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# - - -ADD_LIBRARY(uhd_usrp_mboard STATIC - base.cpp - test.cpp - usrp2.cpp -) |