aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/deps
diff options
context:
space:
mode:
authorAndrej Rode <andrej.rode@ettus.com>2017-03-27 18:05:23 -0700
committerMartin Braun <martin.braun@ettus.com>2017-12-22 15:03:45 -0800
commitc8ae32253b649faea27dcf0d98fd0395924a2eec (patch)
tree8ce89838769d7043f06cb8dc7285b269f9754498 /host/lib/deps
parent53795c74aead4e6021bc788b788f8ed5b4a0166d (diff)
downloaduhd-c8ae32253b649faea27dcf0d98fd0395924a2eec.tar.gz
uhd-c8ae32253b649faea27dcf0d98fd0395924a2eec.tar.bz2
uhd-c8ae32253b649faea27dcf0d98fd0395924a2eec.zip
usrp: add netd find and impl, add uhd rpc client wrapper
Diffstat (limited to 'host/lib/deps')
-rw-r--r--host/lib/deps/CMakeLists.txt5
-rwxr-xr-xhost/lib/deps/import_rpclib.py5
-rw-r--r--host/lib/deps/rpclib/CMakeLists.txt1
3 files changed, 5 insertions, 6 deletions
diff --git a/host/lib/deps/CMakeLists.txt b/host/lib/deps/CMakeLists.txt
index 106f2cd19..bcb89d29a 100644
--- a/host/lib/deps/CMakeLists.txt
+++ b/host/lib/deps/CMakeLists.txt
@@ -14,5 +14,6 @@
# 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(rpclib)
+IF(ENABLE_NETD)
+ ADD_SUBDIRECTORY(rpclib)
+ENDIF()
diff --git a/host/lib/deps/import_rpclib.py b/host/lib/deps/import_rpclib.py
index 2efd29e60..2baccab1a 100755
--- a/host/lib/deps/import_rpclib.py
+++ b/host/lib/deps/import_rpclib.py
@@ -46,7 +46,7 @@ REPLACE_EXPR = [
def fix_naming(workdir):
"""
- replace all the things
+ Applies all the REPLACE_EXPR in all the files
"""
for root, dirs, files in os.walk(workdir):
for cur_file in files:
@@ -78,7 +78,7 @@ def extract_rpclib_version(rpclib_root):
def copy_important_files(target_root, rpclib_root):
"""
- copy files/subdirs we consider important
+ copy files/subdirs we consider important (see IMPORTANT_FILES)
"""
for rpc_file in os.listdir(rpclib_root):
if rpc_file in IMPORTANT_FILES:
@@ -110,7 +110,6 @@ def extract_rpclib(args):
"""
THE extraction function
"""
-
workdir = tempfile.mkdtemp()
rpclib_root = args.rpclib_root
new_rpclib_root = tempfile.mkdtemp()
diff --git a/host/lib/deps/rpclib/CMakeLists.txt b/host/lib/deps/rpclib/CMakeLists.txt
index a1298a464..271a49854 100644
--- a/host/lib/deps/rpclib/CMakeLists.txt
+++ b/host/lib/deps/rpclib/CMakeLists.txt
@@ -1,4 +1,3 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.0.0)
PROJECT(UHD_RPCLIB CXX)
SET(RPCLIB_DEFAULT_BUFFER_SIZE "1024 << 10" CACHE STRING "Default buffer size")