Correctly reference PythonQt's include files (#1310).

opencor · May 18, 2017 · ac006f4 · ac006f4
1 parent ad9eaf4
commit ac006f4
Show file tree

Hide file tree

Showing 12 changed files with 20 additions and 17 deletions.
diff --git a/src/plugins/miscellaneous/PythonConsoleWindow/CTK/ctkPythonConsole.cpp b/src/plugins/miscellaneous/PythonConsoleWindow/CTK/ctkPythonConsole.cpp
@@ -25,7 +25,7 @@
    All rights reserved.
 
    ParaView is a free software; you can redistribute it and/or modify it
-   under the terms of the ParaView license version 1.2. 
+   under the terms of the ParaView license version 1.2.
 
    See http://www.paraview.org/paraview/project/license.html for the full ParaView license.
    A copy of this license can be obtained by contacting
@@ -59,8 +59,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <QVBoxLayout>
 
 // PythonQt includes
-#include <PythonQt.h>
-#include <PythonQtObjectPtr.h>
+#include <PythonQt/PythonQt.h>
+#include <PythonQt/PythonQtObjectPtr.h>
 
 // CTK includes
 #include <ctkConsole.h>

diff --git a/src/plugins/miscellaneous/PythonWrapper/src/pythonwrappercore.h b/src/plugins/miscellaneous/PythonWrapper/src/pythonwrappercore.h
@@ -25,7 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 //==============================================================================
 
-#include "PythonQtPythonInclude.h"
+#include <PythonQt/PythonQtPythonInclude.h>
 
 //==============================================================================
 

diff --git a/src/plugins/miscellaneous/PythonWrapper/src/pythonwrapperdatastore.cpp b/src/plugins/miscellaneous/PythonWrapper/src/pythonwrapperdatastore.cpp
@@ -22,13 +22,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //==============================================================================
 
 #include "datastoreinterface.h"
-#include "pythonqtconversion.h"
 #include "pythonwrapperdatastore.h"
 #include "pythonwrappernumpy.h"
 #include "pythonwrapperplugin.h"
 
 //==============================================================================
 
+#include <PythonQt/pythonqtconversion.h>
+
+//==============================================================================
+
 namespace OpenCOR {
 namespace PythonWrapper {
 

diff --git a/src/plugins/miscellaneous/PythonWrapper/src/pythonwrapperdatastore.h b/src/plugins/miscellaneous/PythonWrapper/src/pythonwrapperdatastore.h
@@ -25,7 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 //==============================================================================
 
-#include "PythonQtPythonInclude.h"
+#include <PythonQt/PythonQtPythonInclude.h>
 
 //==============================================================================
 

diff --git a/src/plugins/miscellaneous/PythonWrapper/src/pythonwrapperplugin.h b/src/plugins/miscellaneous/PythonWrapper/src/pythonwrapperplugin.h
@@ -30,7 +30,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 //==============================================================================
 
-#include "PythonQt.h"
+#include <PythonQt/PythonQt.h>
 
 //==============================================================================
 

diff --git a/src/plugins/miscellaneous/PythonWrapper/src/pythonwrappersimulationexperimentview.cpp b/src/plugins/miscellaneous/PythonWrapper/src/pythonwrappersimulationexperimentview.cpp
@@ -33,7 +33,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 //==============================================================================
 
-#include "PythonQt.h"
+#include <PythonQt/PythonQt.h>
 
 //==============================================================================
 

diff --git a/src/plugins/miscellaneous/PythonWrapper/src/pythonwrappersimulationexperimentview.h b/src/plugins/miscellaneous/PythonWrapper/src/pythonwrappersimulationexperimentview.h
@@ -25,7 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 //==============================================================================
 
-#include "PythonQtPythonInclude.h"
+#include <PythonQt/PythonQtPythonInclude.h>
 
 //==============================================================================
 

diff --git a/src/plugins/miscellaneous/PythonWrapper/src/pythonwrappersolver.h b/src/plugins/miscellaneous/PythonWrapper/src/pythonwrappersolver.h
@@ -25,7 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 //==============================================================================
 
-#include "PythonQtPythonInclude.h"
+#include <PythonQt/PythonQtPythonInclude.h>
 
 //==============================================================================
 

diff --git a/src/plugins/support/PythonQtSupport/CTK/ctkAbstractPythonManager.cpp b/src/plugins/support/PythonQtSupport/CTK/ctkAbstractPythonManager.cpp
@@ -26,10 +26,10 @@
 #include "ctkAbstractPythonManager.h"
 
 // PythonQT includes
-#include <PythonQt.h>
+#include <PythonQt/PythonQt.h>
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-  #include <PythonQt_QtBindings.h>
+  #include <PythonQt/PythonQt_QtAll.h>
 #endif
 
 // STD includes
@@ -155,7 +155,7 @@ void ctkAbstractPythonManager::initPythonQt(int flags)
                 SLOT(printStderr(QString)));
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-  PythonQt_init_QtBindings();
+  PythonQt_QtAll::init();
 #endif
 
   QStringList initCode;

diff --git a/src/plugins/support/PythonQtSupport/CTK/ctkAbstractPythonManager.h b/src/plugins/support/PythonQtSupport/CTK/ctkAbstractPythonManager.h
@@ -28,7 +28,7 @@
 #include <QVariant>
 
 // PythonQt includes
-#include <PythonQtPythonInclude.h> // For PyObject
+#include <PythonQt/PythonQtPythonInclude.h> // For PyObject
 
 // OpenCOR includes
 #include "pythonqtsupportglobal.h"

diff --git a/src/plugins/support/PythonQtSupport/src/pythonqtsupportplugin.cpp b/src/plugins/support/PythonQtSupport/src/pythonqtsupportplugin.cpp
@@ -27,8 +27,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 //==============================================================================
 
-#include <PythonQt.h>
-#include <PythonQt_QtAll.h>
+#include <PythonQt/PythonQt.h>
+#include <PythonQt/PythonQt_QtAll.h>
 
 //==============================================================================
 

diff --git a/src/plugins/thirdParty/PythonQtAPI/CMakeLists.txt b/src/plugins/thirdParty/PythonQtAPI/CMakeLists.txt
@@ -201,7 +201,7 @@ ENDIF()
 
 # Allow other external projects to find our PythonQt package
 
-SET(PYTHONQT_ROOT_DIR ${FULL_INSTALL_DIR} PARENT_SCOPE)
+SET(PYTHONQT_ROOT_DIR ${LOCAL_EXTERNAL_PACKAGE_DIR} PARENT_SCOPE)
 
 # Add the plugin