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

Python 3 compatibility #458

Merged
merged 15 commits into from
Feb 6, 2016
Merged

Python 3 compatibility #458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
b479afd
py3k: Remove tabs from Python files.
QuLogic Nov 15, 2015
ea05c09
py3k: Wrap fwfetcher lines for PEP8.
QuLogic Nov 15, 2015
fd0af44
py3k: Fix various whitespace warnings in fwfetcher.
QuLogic Nov 15, 2015
a548000
py3k: Use print function in fwfetcher.
QuLogic Nov 15, 2015
b0aad13
py3k: Use new-style exception syntax in fwfetcher.
QuLogic Nov 15, 2015
5a9f6dd
py3k: Enable new numerical syntaxes.
QuLogic Nov 15, 2015
155b26a
py3k: Remove old builtin calls in fwfetcher.
QuLogic Nov 15, 2015
6c3e27c
py3k: Use None-identity tests in fwfetcher.
QuLogic Nov 15, 2015
a30d29e
py3k: Import urlopen, etc., from new locations.
QuLogic Nov 15, 2015
cf41bdb
py3k: Use contexts for file I/O in fwfetcher.
QuLogic Nov 15, 2015
d571258
py3k: Use correct bytes IO in fwfetcher.
QuLogic Nov 15, 2015
244a326
py3k: Fix include prints in Python wrapper CMakeLists.txt
QuLogic Nov 15, 2015
3579e20
py3k: Allow build Python wrapper on 2 and/or 3.
QuLogic Nov 16, 2015
1aba9f3
py3k: Clear cached CMake vars so that 2+3 builds work.
QuLogic Nov 16, 2015
9f350c2
py3k: Mention Python 3 support in readme.
QuLogic Nov 16, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
######################################################################################

cmake_minimum_required(VERSION 2.6)
set(PYTHON_EXECUTABLE "python2")

######################################################################################
# Project declaration and options
Expand Down Expand Up @@ -61,7 +60,9 @@ OPTION(BUILD_C_SYNC "Build c synchronous library" ON)
OPTION(BUILD_CPP "Build C++ Library (currently header only)" ON)
OPTION(BUILD_CV "Build OpenCV wrapper" OFF)
OPTION(BUILD_AS3_SERVER "Build the Actionscript 3 Server Example" OFF)
OPTION(BUILD_PYTHON "Build Python extension" OFF)
OPTION(BUILD_PYTHON "Build Python extensions" OFF)
OPTION(BUILD_PYTHON2 "Build Python 2 extension" OFF)
OPTION(BUILD_PYTHON3 "Build Python 3 extension" OFF)
OPTION(BUILD_OPENNI2_DRIVER "Build libfreenect driver for OpenNI2" OFF)
IF(PROJECT_OS_LINUX)
OPTION(BUILD_CPACK_DEB "Build an DEB using CPack" OFF)
Expand Down Expand Up @@ -157,6 +158,10 @@ IF(BUILD_AS3_SERVER)
ENDIF()

IF(BUILD_PYTHON)
set(BUILD_PYTHON2 ON)
set(BUILD_PYTHON3 ON)
ENDIF()
IF(BUILD_PYTHON2 OR BUILD_PYTHON3)
add_subdirectory (wrappers/python)
ENDIF()

Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ To build libfreenect, you'll need

- [libusb](http://libusb.info) >= 1.0.18
- [CMake](http://cmake.org) >= 2.6
- [python](http://python.org) == 2.* (only if BUILD_PYTHON=ON or BUILD_REDIST_PACKAGE=OFF)
- [python](http://python.org) >= 2.7 or >= 3.3 (only if BUILD_PYTHON=ON or BUILD_PYTHON2=ON or BUILD_PYTHON3=ON or BUILD_REDIST_PACKAGE=OFF)

For the examples, you'll need

Expand Down
Loading