Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make python installation respect CMAKE_INSTALL_PREFIX #10827

Open
wants to merge 2 commits into
base: development
Choose a base branch
from
+4 −4
Open

Make python installation respect CMAKE_INSTALL_PREFIX #10827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da78c9b
Switched unicode ' like character to ascii '
m-elwin Aug 25, 2022
06347cf
Fixes Issue #10820 Python bindings don't respect CMAKE_INSTALL_PREFIX
m-elwin Aug 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/libusb/libusb.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
#if 0
In file included from /home/administrator/lrs/src/libusb/request-libusb.h:6:0,
from /home/administrator/lrs/src/libusb/request-libusb.cpp:4:
/usr/include/libusb-1.0/libusb.h:736:4: warning: ISO C++ forbids zero-size array ‘dev_capability_data’ [-Wpedantic]
/usr/include/libusb-1.0/libusb.h:736:4: warning: ISO C++ forbids zero-size array 'dev_capability_data' [-Wpedantic]
[0] /* non-standard, but usually working code */
^
/usr/include/libusb-1.0/libusb.h:767:4: warning: ISO C++ forbids zero-size array ‘dev_capability’ [-Wpedantic]
/usr/include/libusb-1.0/libusb.h:767:4: warning: ISO C++ forbids zero-size array 'dev_capability' [-Wpedantic]
[0] /* non-standard, but usually working code */
^
In file included from /home/administrator/lrs/src/libusb/request-libusb.h:6:0,
from /home/administrator/lrs/src/libusb/request-libusb.cpp:4:
/usr/include/libusb-1.0/libusb.h:1260:4: warning: ISO C++ forbids zero-size array ‘iso_packet_desc’ [-Wpedantic]
/usr/include/libusb-1.0/libusb.h:1260:4: warning: ISO C++ forbids zero-size array 'iso_packet_desc' [-Wpedantic]
[0] /* non-standard, but usually working code */
^
#endif
Expand Down
2 changes: 1 addition & 1 deletion wrappers/python/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ if (CMAKE_VERSION VERSION_LESS 3.12)
set(CMAKECONFIG_PY_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/pyrealsense2")
else()
find_package(Python REQUIRED COMPONENTS Interpreter Development)
set(PYTHON_INSTALL_DIR "${Python_SITEARCH}/pyrealsense2" CACHE PATH "Installation directory for Python bindings")
set(PYTHON_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/python${Python_VERSION_MAJOR}.${Python_VERSION_MINOR}/pyrealsense2" CACHE PATH "Installation directory for Python bindings")
set(CMAKECONFIG_PY_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/pyrealsense2")
endif()

Expand Down