010-screencloud-fix-python-link-libraries.patch 1020 B

123456789101112131415161718192021222324252627282930313233343536373839
  1. --- a/CMakeLists.txt
  2. +++ b/CMakeLists.txt
  3. @@ -263,17 +263,6 @@ set(REQUIRED_LIBS ${REQUIRED_LIBS}
  4. ${QUAZIP_LIBRARY}
  5. )
  6. -#Find Python
  7. -if(PYTHON_USE_PYTHON3)
  8. - find_package(PythonLibs 3.3 REQUIRED)
  9. -else(PYTHON_USE_PYTHON3)
  10. - find_package(PythonLibs 2.6 REQUIRED)
  11. -endif(PYTHON_USE_PYTHON3)
  12. -include_directories(${PYTHON_INCLUDE_DIR})
  13. -set(REQUIRED_LIBS ${REQUIRED_LIBS}
  14. - ${PYTHON_LIBRARIES}
  15. -)
  16. -
  17. #Find PythonQt
  18. find_package(PythonQt REQUIRED)
  19. include_directories(${PYTHONQT_INCLUDE_DIR})
  20. @@ -293,6 +282,17 @@ else(PYTHONQT_QTALL_FOUND)
  21. message(STATUS "Using PythonQt_QtBindings (old) for Qt bindings.")
  22. endif(PYTHONQT_QTALL_FOUND)
  23. +#Find Python
  24. +if(PYTHON_USE_PYTHON3)
  25. + find_package(PythonLibs 3.3 REQUIRED)
  26. +else(PYTHON_USE_PYTHON3)
  27. + find_package(PythonLibs 2.6 REQUIRED)
  28. +endif(PYTHON_USE_PYTHON3)
  29. +include_directories(${PYTHON_INCLUDE_DIR})
  30. +set(REQUIRED_LIBS ${REQUIRED_LIBS}
  31. + ${PYTHON_LIBRARIES}
  32. +)
  33. +
  34. #Platform specific libs
  35. if(WIN32)
  36. set(REQUIRED_LIBS ${REQUIRED_LIBS}