forked from pool/paraview
d3c9ee6857
Update to v5.2. Switch to Qt5 if available, several other improvements (see .changes) OBS-URL: https://build.opensuse.org/request/show/443561 OBS-URL: https://build.opensuse.org/package/show/science/paraview?expand=0&rev=45
43 lines
1.5 KiB
Diff
43 lines
1.5 KiB
Diff
Index: ParaView-v5.2.0/CMake/ParaViewMacros.cmake
|
|
===================================================================
|
|
--- ParaView-v5.2.0.orig/CMake/ParaViewMacros.cmake
|
|
+++ ParaView-v5.2.0/CMake/ParaViewMacros.cmake
|
|
@@ -251,9 +251,16 @@ function (generate_htmls_from_xmls outpu
|
|
# file we use.
|
|
get_filename_component(first_xml "${first_xml}" NAME)
|
|
|
|
+ if (PARAVIEW_QT_VERSION STREQUAL "4")
|
|
+ set(qt_binary_dir_hints "${QT_BINARY_DIR}")
|
|
+ else() # Qt5
|
|
+ # Qt5's CMake config doesn't support QT_BINARY_DIR
|
|
+ set(qt_binary_dir_hints "${Qt5_DIR}/../../../bin")
|
|
+ endif()
|
|
+
|
|
find_program(QT_XMLPATTERNS_EXECUTABLE
|
|
- xmlpatterns
|
|
- HINTS "${QT_BINARY_DIR}"
|
|
+ NAMES xmlpatterns xmlpatterns-qt5
|
|
+ HINTS "${qt_binary_dir_hints}"
|
|
DOC "xmlpatterns used to generate html from Proxy documentation.")
|
|
mark_as_advanced(QT_XMLPATTERNS_EXECUTABLE)
|
|
|
|
@@ -339,9 +346,16 @@ function(build_help_project name)
|
|
message(FATAL_ERROR "No DESTINATION_DIRECTORY specified in build_help_project()")
|
|
endif()
|
|
|
|
+ if (PARAVIEW_QT_VERSION STREQUAL "4")
|
|
+ set(qt_binary_dir_hints "${QT_BINARY_DIR}")
|
|
+ else() # Qt5
|
|
+ # Qt5's CMake config doesn't support QT_BINARY_DIR
|
|
+ set(qt_binary_dir_hints "${Qt5_DIR}/../../../bin")
|
|
+ endif()
|
|
+
|
|
find_program(QT_HELP_GENERATOR
|
|
- qhelpgenerator
|
|
- HINTS "${QT_BINARY_DIR}"
|
|
+ NAMES qhelpgenerator qhelpgenerator-qt5
|
|
+ HINTS "${qt_binary_dir_hints}"
|
|
DOC "qhelpgenerator used to compile Qt help project files")
|
|
mark_as_advanced(QT_HELP_GENERATOR)
|
|
|