From 192fa42af6508d13149a2f7ccdf27c3438692d21 Mon Sep 17 00:00:00 2001
From: "Travis F. Collins" <travis.collins@analog.com>
Date: Mon, 8 Jun 2020 11:44:48 -0700
Subject: [PATCH] Enable pydoc to be built without library installed
This fixes some pathing issues with the sphinx doc that previously
required the library to be installed before sphinx doc could be
correctly built. This fixes #547
Signed-off-by: Travis F. Collins <travis.collins@analog.com>
---
bindings/python/CMakeLists.txt | 3 ++-
bindings/python/setup.py.cmakein | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/bindings/python/CMakeLists.txt b/bindings/python/CMakeLists.txt
index 0d899cb3..21b2d191 100644
--- a/bindings/python/CMakeLists.txt
+++ b/bindings/python/CMakeLists.txt
@@ -43,7 +43,8 @@ if(WITH_DOC)
${CMAKE_CURRENT_SOURCE_DIR}/doc/conf.py.in
${CMAKE_CURRENT_SOURCE_DIR}/doc/conf.py)
add_custom_command(TARGET libiio-py POST_BUILD
- COMMAND ${SPHINX_EXECUTABLE}
+ COMMAND ${CMAKE_COMMAND} -E env "LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH}:${CMAKE_BINARY_DIR}"
+ ${SPHINX_EXECUTABLE}
-b html
-n
-c ${CMAKE_CURRENT_SOURCE_DIR}/doc
diff --git a/bindings/python/setup.py.cmakein b/bindings/python/setup.py.cmakein
index dd40c11c..cd14e2e9 100644
--- a/bindings/python/setup.py.cmakein
+++ b/bindings/python/setup.py.cmakein
@@ -69,8 +69,8 @@ class InstallWrapper(install):
destdir = os.getenv("DESTDIR", "")
if destdir:
destdir = os.path.join("${CMAKE_BINARY_DIR}", destdir)
- out = find_recursive(destdir, "libiio.so")
- _lib = _cdll(out, use_errno=True, use_last_error=True)
+ fulllibpath = find_recursive(destdir, "libiio.so")
+ _lib = _cdll(fulllibpath, use_errno=True, use_last_error=True)
else:
_lib = _cdll(find_library(_iiolib), use_errno=True, use_last_error=True)
if not _lib._name: