[libcalamaresui] Use PYTHONQT_INCLUDE_DIRS

- document new variable from the CMake module
 - use it in libcalamaresui to simplify #include'ing the
   header for the "all" extension.

Suggested by Denis Proskurin.
This commit is contained in:
Adriaan de Groot 2018-09-03 06:26:26 -04:00
parent 54bee71b44
commit 4602b30264
3 changed files with 6 additions and 2 deletions

View File

@ -2,6 +2,9 @@
# #
# Sets PYTHONQT_FOUND, PYTHONQT_INCLUDE_DIR, PYTHONQT_LIBRARY, PYTHONQT_LIBRARIES # Sets PYTHONQT_FOUND, PYTHONQT_INCLUDE_DIR, PYTHONQT_LIBRARY, PYTHONQT_LIBRARIES
# #
# Also sets PYTHONQT_INCLUDE_DIRS to add whatever directories
# that are needed for extensions.
#
# Python is required # Python is required
find_package(PythonLibs) find_package(PythonLibs)

View File

@ -48,7 +48,8 @@ endif()
if( WITH_PYTHONQT ) if( WITH_PYTHONQT )
include_directories(${PYTHON_INCLUDE_DIRS}) include_directories(${PYTHON_INCLUDE_DIRS})
include_directories(${PYTHONQT_INCLUDE_DIR}) # *_DIRS because we also use extensions
include_directories(${PYTHONQT_INCLUDE_DIRS})
list( APPEND calamaresui_SOURCES list( APPEND calamaresui_SOURCES
modulesystem/PythonQtViewModule.cpp modulesystem/PythonQtViewModule.cpp

View File

@ -31,7 +31,7 @@
#include "JobQueue.h" #include "JobQueue.h"
#include <PythonQt.h> #include <PythonQt.h>
#include <extensions/PythonQt_QtAll/PythonQt_QtAll.h> #include <PythonQt_QtAll.h>
#include <QDir> #include <QDir>
#include <QPointer> #include <QPointer>