Port vtk7 qt5 #508
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,6 +15,13 @@ option(USE_SYSTEM_EIGEN "Use system version of eigen. If off, eigen will be bui | |
| option(USE_SYSTEM_LCM "Use system version of lcm. If off, lcm will be built." OFF) | ||
| option(USE_SYSTEM_LIBBOT "Use system version of libbot. If off, libbot will be built." OFF) | ||
| option(USE_SYSTEM_PCL "Use system version of pcl. If off, pcl will be built." OFF) | ||
| option(USE_SYSTEM_VTK "Use system version of VTK. If off, VTK will be built." ON) | ||
|
|
||
| set(DD_QT_VERSION "5" CACHE STRING "Expected Qt version") | ||
| set_property(CACHE DD_QT_VERSION PROPERTY STRINGS 4 5) | ||
| if(NOT (DD_QT_VERSION VERSION_EQUAL "4" OR DD_QT_VERSION VERSION_EQUAL "5")) | ||
| message(FATAL_ERROR "Expected value for DD_QT_VERSION is either '4' or '5'") | ||
| endif() | ||
|
|
||
| if(USE_DRAKE) | ||
| set(DRAKE_SOURCE_DIR CACHE PATH "") | ||
|
|
@@ -37,11 +44,26 @@ set(default_cmake_args | |
| ) | ||
|
|
||
| # Find required external dependencies | ||
| set(qt_args) | ||
| if (${DD_QT_VERSION} VERSION_GREATER "4") | ||
| if(APPLE) | ||
| set(qt_homebrew_dir /usr/local/opt/qt/lib/cmake/) | ||
| endif() | ||
| find_package(Qt5 REQUIRED COMPONENTS Core Gui Widgets OpenGL | ||
| PATHS ${qt_homebrew_dir}) | ||
| set(qt_args | ||
| -DQt5_DIR:PATH=${Qt5_DIR} | ||
| -DQt5Core_DIR:PATH=${Qt5Core_DIR} | ||
| -DQt5Gui_DIR:PATH=${Qt5Gui_DIR} | ||
| -DQt5Widgets_DIR:PATH=${Qt5Widgets_DIR} | ||
| ) | ||
| else() | ||
| find_package(Qt4 4.8 REQUIRED) | ||
| set(qt_args | ||
| -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE} | ||
| ) | ||
| endif() | ||
|
|
||
|
|
||
| if(APPLE) | ||
| find_program(PYTHON_CONFIG_EXECUTABLE python-config) | ||
|
|
@@ -76,6 +98,7 @@ ExternalProject_Add( | |
| URL_MD5 a0e0a32d62028218b1c1848ad7121476 | ||
| CMAKE_CACHE_ARGS | ||
| ${default_cmake_args} | ||
| ${qt_args} | ||
| ) | ||
|
|
||
| ExternalProject_Add_Step(eigen make_pkgconfig_dir | ||
|
|
@@ -224,9 +247,18 @@ endif() | |
|
|
||
| ############################################################################### | ||
| # PythonQt | ||
| set(PythonQt_REPO) | ||
| set(PythonQt_TAG) | ||
| if(${DD_QT_VERSION} VERSION_GREATER "4") | ||
| set(PythonQt_REPO https://github.com/patmarion/PythonQt.git) | ||
| set(PythonQt_TAG fix-compile-error-on-qt5.8) | ||
| else() | ||
| set(PythonQt_REPO https://github.com/commontk/PythonQt.git) | ||
| set(PythonQt_TAG patched-6) | ||
| endif() | ||
| ExternalProject_Add(PythonQt | ||
| GIT_REPOSITORY ${PythonQt_REPO} | ||
| GIT_TAG ${PythonQt_TAG} | ||
| CMAKE_CACHE_ARGS | ||
| ${default_cmake_args} | ||
| ${qt_args} | ||
|
|
@@ -238,9 +270,18 @@ ExternalProject_Add(PythonQt | |
|
|
||
| ############################################################################### | ||
| # ctkPythonConsole | ||
| set(ctkPythonConsole_REPO) | ||
| set(ctkPythonConsole_TAG) | ||
| if(${DD_QT_VERSION} VERSION_GREATER "4") | ||
| set(ctkPythonConsole_REPO https://github.com/mwoehlke-kitware/ctkPythonConsole) | ||
| set(ctkPythonConsole_TAG qt5) | ||
|
Contributor
Author
There was a problem hiding this comment. @mwoehlke-kitware Mind creating a PR for branch qt5 on ctkPythonConsole and mention this PR (#508) ?
Contributor
There was a problem hiding this comment. Indeed; I think we should be able to use a single repo/tag here?
Contributor
There was a problem hiding this comment. On closer inspection, it seems this would need tweaking to work with either Qt4 or Qt5. I don't know that I'll be able to do that; @sankhesh, can you do it? |
||
| else() | ||
| set(ctkPythonConsole_REPO https://github.com/patmarion/ctkPythonConsole) | ||
| set(ctkPythonConsole_TAG 15988c5) | ||
| endif() | ||
| ExternalProject_Add(ctkPythonConsole | ||
| GIT_REPOSITORY ${ctkPythonConsole_REPO} | ||
| GIT_TAG ${ctkPythonConsole_TAG} | ||
| CMAKE_CACHE_ARGS | ||
| ${default_cmake_args} | ||
| ${qt_args} | ||
|
|
@@ -251,52 +292,95 @@ ExternalProject_Add(ctkPythonConsole | |
|
|
||
| ############################################################################### | ||
| # QtPropertyBrowser | ||
| set(QtPropertyBrowser_REPO) | ||
| set(QtPropertyBrowser_TAG) | ||
| if(${DD_QT_VERSION} VERSION_GREATER "4") | ||
| set(QtPropertyBrowser_REPO https://github.com/intbots/QtPropertyBrowser) | ||
| set(QtPropertyBrowser_TAG master) | ||
| else() | ||
| set(QtPropertyBrowser_REPO https://github.com/patmarion/QtPropertyBrowser) | ||
| set(QtPropertyBrowser_TAG baf10af) | ||
| endif() | ||
| ExternalProject_Add(QtPropertyBrowser | ||
| GIT_REPOSITORY ${QtPropertyBrowser_REPO} | ||
| GIT_TAG ${QtPropertyBrowser_TAG} | ||
| CMAKE_CACHE_ARGS | ||
| ${default_cmake_args} | ||
| ${qt_args} | ||
| -DCMAKE_MACOSX_RPATH:BOOL=ON | ||
| ) | ||
|
|
||
|
|
||
| ############################################################################### | ||
| # vtk | ||
|
|
||
| if(NOT USE_SYSTEM_VTK) | ||
|
|
||
| set(BUILD_VTK TRUE) | ||
| if(UNIX AND NOT APPLE) | ||
| option(DOWNLOAD_VTK_PACKAGE | ||
| "Download and install pre-built VTK package. If off, VTK will be built." | ||
| ON) | ||
|
|
||
| if(DOWNLOAD_VTK_PACKAGE) | ||
| set(vtk_package_url "https://d2mbb5ninhlpdu.cloudfront.net/vtk") | ||
| if(${DD_QT_VERSION} VERSION_GREATER "4") | ||
| set(vtk_package_url | ||
| "${vtk_package_url}/vtk-v8.0.0.rc2-qt-5.5.1-xenial-x86_64.tar.gz" | ||
| ) | ||
| set(vtk_package_md5 3dd13a3001fead90ead6547c8277a674) | ||
| else() | ||
| set(vtk_package_url | ||
| "${vtk_package_url}/vtk-v8.0.0.rc2-qt-4.8.6-trusty-x86_64.tar.gz" | ||
| ) | ||
| set(vtk_package_md5 250e5b49f42db7a30b4269294be9223f) | ||
| endif() | ||
| set(BUILD_VTK FALSE) | ||
| ExternalProject_Add(vtk | ||
| URL ${vtk_package_url} | ||
| URL_MD5 ${vtk_package_md5} | ||
| CONFIGURE_COMMAND "" | ||
| BUILD_COMMAND "" | ||
| INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory | ||
| ${PROJECT_BINARY_DIR}/src/vtk ${install_prefix} | ||
| ) | ||
| endif() | ||
| endif() | ||
| if(BUILD_VTK) | ||
| ExternalProject_Add(vtk | ||
| GIT_REPOSITORY git://vtk.org/VTK.git | ||
| GIT_TAG 28deb5620e56f535fc92ff8c73ef00f54923839b | ||
| CMAKE_CACHE_ARGS | ||
| ${default_cmake_args} | ||
| ${python_args} | ||
| ${qt_args} | ||
| -DBUILD_SHARED_LIBS:BOOL=ON | ||
| -DBUILD_TESTING:BOOL=OFF | ||
| -DBUILD_EXAMPLES:BOOL=OFF | ||
| -DVTK_RENDERING_BACKEND:STRING=OpenGL2 | ||
| -DVTK_QT_VERSION:STRING=${DD_QT_VERSION} | ||
| -DModule_vtkGUISupportQt:BOOL=ON | ||
| -DCMAKE_MACOSX_RPATH:BOOL=ON | ||
| -DVTK_WRAP_PYTHON:BOOL=ON | ||
| ) | ||
| endif() | ||
|
|
||
| set(vtk_args -DVTK_DIR:PATH=${install_prefix}/lib/cmake/vtk-7.1) | ||
| set(vtk_depends vtk) | ||
| else() | ||
|
|
||
| if(APPLE) | ||
| set(vtk_homebrew_dir /usr/local/opt/vtk@8.0/lib/cmake/vtk) | ||
| endif() | ||
|
|
||
| # Verifies that the system has VTK5. | ||
| find_package(VTK REQUIRED PATHS ${vtk_homebrew_dir}) | ||
| if (${VTK_VERSION} VERSION_LESS "8.0") | ||
| message(FATAL_ERROR "Director requires a VTK minimum version of v8.0." | ||
| " System has VTK version ${VTK_VERSION}") | ||
| endif() | ||
|
|
||
| set(vtk_args -DVTK_DIR:PATH=${VTK_DIR}) | ||
| endif() | ||
|
|
||
|
|
||
|
|
@@ -475,6 +559,7 @@ ExternalProject_Add(director | |
| -DUSE_COLLECTIONS:BOOL=${USE_COLLECTIONS} | ||
| -DUSE_LIBBOT:BOOL=${USE_LIBBOT} | ||
| -DUSE_DRAKE:BOOL=${USE_DRAKE} | ||
| -DDD_QT_VERSION:STRING=${DD_QT_VERSION} | ||
|
|
||
| ${default_cmake_args} | ||
| ${eigen_args} | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@patmarion Mind creating a PR on PythonQt for branch fix-compile-error-on-qt5.8 and mention this PR (#508)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@patmarion ping!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes, eventually we will get this in. upstream PythonQt is actually a svn repo. The CommonToolkit group manages some unofficial patched branches on Github. I think this is already fixed upstream in svn but I'm not sure if CTK's branches are up to date or not. I will try to look into it. In the meantime, I have no problem referencing this branch.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sigh... commontk/PythonQt#50 (apparently I can create a PR of Pat's branch).
@sankhesh, does patched-7 still work with Qt4?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i think patched-7 has removed qt4 support. the src dir generated_cpp_47 was removed in that branch.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Okay... but at least commontk/PythonQt#50 would let us use the same repository in either case, and just a different branch.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks @patmarion @mwoehlke-kitware
I'm not sure why pythonqt decided to drop the generated sources for Qt4 because the CMake code still seems to support both Qt4 and Qt5. Compilation fails when it can't find the generated sources with Qt4.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It can definitively be re-added. It would be nice to work with Florian (from mevislab) and push the patches upstream. I do not have the bandwidth currently ...