]>
Commit | Line | Data |
---|---|---|
807f0e8d JB |
1 | --- createrepo_c-0.10.0/doc/python/CMakeLists.txt.orig 2018-05-11 20:05:51.125805641 +0200 |
2 | +++ createrepo_c-0.10.0/doc/python/CMakeLists.txt 2018-05-11 20:08:41.395803696 +0200 | |
16c66ee9 JB |
3 | @@ -1,5 +1,5 @@ |
4 | ADD_CUSTOM_TARGET (doc-python | |
5 | - PYTHONPATH=${CMAKE_BINARY_DIR}/src/python sphinx-build -E -b html | |
6 | + PYTHONPATH=${CMAKE_BINARY_DIR}/src/python sphinx-build-2 -E -b html | |
807f0e8d | 7 | ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/html |
16c66ee9 JB |
8 | COMMENT "Building Python API documentation with Sphinx") |
9 | ||
807f0e8d JB |
10 | --- createrepo_c-0.10.0/src/python/CMakeLists.txt.orig 2018-05-11 20:05:51.125805641 +0200 |
11 | +++ createrepo_c-0.10.0/src/python/CMakeLists.txt 2018-05-11 20:09:44.352469646 +0200 | |
12 | @@ -5,8 +5,8 @@ if (${PYTHON_DESIRED} STREQUAL "2") | |
13 | unset(PYTHON_LIBRARY CACHE) | |
14 | unset(PYTHON_INCLUDE_DIR CACHE) | |
15 | unset(PYTHON_EXECUTABLE CACHE) | |
16 | - FIND_PACKAGE(PythonLibs 2) | |
17 | FIND_PACKAGE(PythonInterp 2 REQUIRED) | |
18 | + FIND_PACKAGE(PythonLibs 2) | |
19 | else() | |
20 | SET(Python_ADDITIONAL_VERSIONS 3.0) | |
21 | unset(PYTHON_LIBRARY) | |
22 | @@ -15,11 +15,11 @@ else() | |
23 | unset(PYTHON_LIBRARY CACHE) | |
24 | unset(PYTHON_INCLUDE_DIR CACHE) | |
25 | unset(PYTHON_EXECUTABLE CACHE) | |
26 | - FIND_PACKAGE(PythonLibs 3.0) | |
27 | FIND_PACKAGE(PythonInterp 3.0 REQUIRED) | |
28 | + FIND_PACKAGE(PythonLibs 3.0) | |
29 | endif() | |
30 | ||
16c66ee9 | 31 | -EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(True))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) |
16c66ee9 JB |
32 | +EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(True, prefix='/usr'))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) |
33 | INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH}) | |
34 | ||
35 | MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}") |