diff options
| author | Alejandro Hernandez <ajhernandez@ti.com> | 2017-02-03 10:11:58 -0500 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2017-02-06 12:59:32 +0200 |
| commit | 643d678146f0e292ed211e9fe214c145e697d2d4 (patch) | |
| tree | cd9c12a54ad64f5b652bb78840dd9e5b8073adf5 | |
| parent | 0286945fdda0dee8881c0e00ef8942ac3f7999c9 (diff) | |
Support python2 based pykms binding
Previously only binding with python3 was supported, this patch allows
compilation of pykms with python3 or python2. When compiling with
python2 some of the python scripts located in the py/test will not work
since they import python3 only modules
Signed-off-by: Alejandro Hernandez <ajhernandez@ti.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | README.md | 13 | ||||
| -rw-r--r-- | py/pykms/CMakeLists.txt | 2 |
3 files changed, 10 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 324b7df..57088bc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,6 +21,8 @@ option(BUILD_SHARED_LIBS "Build shared libs" FALSE) option(TREAT_WARNINGS_AS_ERRORS "Treat warnings as errors" FALSE) set(KMSXX_ENABLE_PYTHON ON CACHE BOOL "Enable Python wrappers") +set(KMSXX_PYTHON_VERSION "python3;python2" CACHE STRING "Python pkgconfig package") + set(KMSXX_ENABLE_KMSCUBE OFF CACHE BOOL "Enable kmscube") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 -Wall") @@ -72,12 +72,13 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) You can use the following cmake flags to control the build. Use `-DFLAG=VALUE` to set them. -Option name | Values | Default | Notes ---------------------- | ------------- | -------- | -------- -CMAKE_BUILD_TYPE | Release/Debug | Release | -BUILD_SHARED_LIBS | ON/OFF | OFF | -KMSXX_ENABLE_PYTHON | ON/OFF | ON | -KMSXX_ENABLE_KMSCUBE | ON/OFF | OFF | +Option name | Values | Default | Notes +--------------------- | ------------- | --------------- | -------- +CMAKE_BUILD_TYPE | Release/Debug | Release | +BUILD_SHARED_LIBS | ON/OFF | OFF | +KMSXX_ENABLE_PYTHON | ON/OFF | ON | +KMSXX_ENABLE_KMSCUBE | ON/OFF | OFF | +KMSXX_PYTHON_VERSION | python3/python2 | python3;python2 | Name of the python pkgconfig file ## Env variables diff --git a/py/pykms/CMakeLists.txt b/py/pykms/CMakeLists.txt index a671b7a..505c0c3 100644 --- a/py/pykms/CMakeLists.txt +++ b/py/pykms/CMakeLists.txt @@ -1,7 +1,7 @@ include_directories(${LIBDRM_INCLUDE_DIRS}) link_directories(${LIBDRM_LIBRARY_DIRS}) -pkg_check_modules(PYTHON python3 REQUIRED) +pkg_search_module(PYTHON REQUIRED ${KMSXX_PYTHON_VERSION}) include_directories(${PYTHON_INCLUDE_DIRS}) if (NOT ${U_CMAKE_BUILD_TYPE} MATCHES DEBUG) |