diff options
author | Josh Blum <josh@joshknows.com> | 2010-02-15 19:11:34 -0800 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2010-02-15 19:11:34 -0800 |
commit | 9d1041f8150e047d929aaf7c0461201f043d8b93 (patch) | |
tree | 6b8bfcd1f5e9a68d286b19c64bc4f390701a2552 /lib/usrp | |
parent | e8b60b03e62bdca247ed92e91c01f27dfebd487e (diff) | |
download | uhd-9d1041f8150e047d929aaf7c0461201f043d8b93.tar.gz uhd-9d1041f8150e047d929aaf7c0461201f043d8b93.tar.bz2 uhd-9d1041f8150e047d929aaf7c0461201f043d8b93.zip |
CMake does not have convenience libraries like automake.
Removed the nested lib CMakeLists.txt in favor of a single
top level lib/CMakeLists.txt for building the shared library.
Diffstat (limited to 'lib/usrp')
-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 |
3 files changed, 0 insertions, 75 deletions
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 -) |