libcamera: utils: Adapt libcameraPath to match use cases

The two callers of functions libcameraPath() and isLibcameraInstalled()
end up using the same process and finally use the path with
libcamera.so. Hence write a function libcameraBuildPath() which
combines their functions and returns the root of the build sources
when the library has not been installed, but is running from the build
tree, thereby making call sites simpler.

When the library is installed, libcameraBuildPath() will return an empty
string.

Make changes in the call sites accordingly.

Signed-off-by: Kaaira Gupta <kgupta@es.iitr.ac.in>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

This commit is contained in:

Kaaira Gupta

2020-03-19 21:31:40 +05:30

committed by

Laurent Pinchart

parent 6c34a2d386

commit 1b8ac8473c

4 changed files with 25 additions and 16 deletions

									
										src/libcamera/include/utils.h
									
		+1
		-3
	
												View File
												
				@@ -143,9 +143,7 @@ private:

				details::StringSplitter split(const std::string &str, const std::string &delim);

				bool isLibcameraInstalled();

				std::string libcameraPath();

				std::string libcameraBuildPath();

				} /* namespace utils */