diff options
| author | Arne Morten Kvarving <cptspiff@gmail.com> | 2017-01-16 00:11:24 +0100 |
|---|---|---|
| committer | Arne Morten Kvarving <cptspiff@gmail.com> | 2017-01-19 15:55:52 +0100 |
| commit | da31ddeede623fc3eb632b32f2d5bd60a279c64c (patch) | |
| tree | 93fa33120e4fed1bdbbc2d6cd035e9a36f8cbd06 /cmake | |
| parent | 22cf5fa45f927397eb93092daf9e67558cd483e5 (diff) | |
restore the ability to build without python and add cmake option
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/FindPython.cmake | 2 | ||||
| -rw-r--r-- | cmake/treedata/common/interfaces.txt | 3 | ||||
| -rw-r--r-- | cmake/treedata/optional/common/python.txt | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/cmake/modules/FindPython.cmake b/cmake/modules/FindPython.cmake index 75dcd6cfbb..4f1b49abe0 100644 --- a/cmake/modules/FindPython.cmake +++ b/cmake/modules/FindPython.cmake @@ -29,11 +29,11 @@ else() list(APPEND PYTHON_LIBRARIES ${PC_PYTHON_STATIC_LIBRARIES}) endif() - include(FindPackageHandleStandardArgs) find_package_handle_standard_args(PYTHON REQUIRED_VARS PYTHON_INCLUDE_DIR PYTHON_LIBRARY PYTHON_LIBRARIES) if(PYTHON_FOUND) set(PYTHON_INCLUDE_DIRS ${PYTHON_INCLUDE_DIR}) + list(APPEND PYTHON_DEFINITIONS -DHAS_PYTHON=1) endif() mark_as_advanced(PYTHON_EXECUTABLE PYTHON_INCLUDE_DIRS PYTHON_INCLUDE_DIR PYTHON_LIBRARY PYTHON_LIBRARIES PYTHON_LDFLAGS FFI_LIBRARY EXPAT_LIBRARY INTL_LIBRARY GMP_LIBRARY) diff --git a/cmake/treedata/common/interfaces.txt b/cmake/treedata/common/interfaces.txt index ffd35706d4..705697e61c 100644 --- a/cmake/treedata/common/interfaces.txt +++ b/cmake/treedata/common/interfaces.txt @@ -4,6 +4,3 @@ xbmc/interfaces/generic interfaces/generic xbmc/interfaces/info interfaces/info xbmc/interfaces/json-rpc interfaces/json-rpc xbmc/interfaces/json-rpc/schema interfaces/json-rpc/schema -xbmc/interfaces/legacy interfaces/legacy -xbmc/interfaces/legacy/wsgi interfaces/legacy/wsgi -xbmc/interfaces/python interfaces/python diff --git a/cmake/treedata/optional/common/python.txt b/cmake/treedata/optional/common/python.txt new file mode 100644 index 0000000000..49604855c8 --- /dev/null +++ b/cmake/treedata/optional/common/python.txt @@ -0,0 +1,4 @@ +xbmc/interfaces/legacy interfaces/legacy # PYTHON +xbmc/interfaces/legacy/wsgi interfaces/legacy/wsgi # PYTHON +xbmc/interfaces/python interfaces/python # PYTHON +xbmc/interfaces/swig build/swig # PYTHON |