mirror of
https://develop.openfoam.com/Development/ThirdParty-common.git
synced 2025-12-08 06:57:50 +00:00
391a6b24ca
- also avoid issues with '+' being treated as a list separator (already patched in 5.2) -- STYLE: reformat version check output (in makeParaView)
88 lines
3.9 KiB
Groff
88 lines
3.9 KiB
Groff
--- ParaView-5.0.1/VTK/CMake/vtkCompilerExtras.cmake.orig 2016-03-28 17:07:10.000000000 +0200
|
|
+++ ParaView-5.0.1/VTK/CMake/vtkCompilerExtras.cmake 2016-12-13 17:21:25.382720945 +0100
|
|
@@ -32,7 +32,7 @@
|
|
OUTPUT_VARIABLE _gcc_version_info
|
|
ERROR_VARIABLE _gcc_version_info)
|
|
|
|
- string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]*"
|
|
+ string (REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]*"
|
|
_gcc_version "${_gcc_version_info}")
|
|
if(NOT _gcc_version)
|
|
string (REGEX REPLACE ".*\\(GCC\\).*([34]\\.[0-9]).*" "\\1.0"
|
|
--- ParaView-5.0.1/VTK/CMake/GenerateExportHeader.cmake.orig 2016-03-28 17:07:10.000000000 +0200
|
|
+++ ParaView-5.0.1/VTK/CMake/GenerateExportHeader.cmake 2016-12-13 17:21:25.382720945 +0100
|
|
@@ -166,7 +166,7 @@
|
|
execute_process(COMMAND ${CMAKE_C_COMPILER} ARGS --version
|
|
OUTPUT_VARIABLE _gcc_version_info
|
|
ERROR_VARIABLE _gcc_version_info)
|
|
- string(REGEX MATCH "[345]\\.[0-9]\\.[0-9]*"
|
|
+ string(REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]*"
|
|
_gcc_version "${_gcc_version_info}")
|
|
# gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the
|
|
# patch level, handle this here:
|
|
--- ParaView-5.0.1/Qt/Components/CMakeLists.txt.orig 2016-03-28 17:07:03.000000000 +0200
|
|
+++ ParaView-5.0.1/Qt/Components/CMakeLists.txt 2016-12-13 17:38:42.713553032 +0100
|
|
@@ -656,7 +656,7 @@
|
|
#the pqSGExportStateWizard has subclasses that directly access
|
|
#the UI file, and currently we don't have a clean way to break this hard
|
|
#dependency, so for no we install this ui file.
|
|
-if(PARAVIEW_INSTALL_DEVELOPMENT_FILES)
|
|
+if(PARAVIEW_INSTALL_DEVELOPMENT_FILES AND PARAVIEW_ENABLE_PYTHON)
|
|
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ui_pqExportStateWizard.h"
|
|
DESTINATION "${VTK_INSTALL_INCLUDE_DIR}")
|
|
endif()
|
|
--- ParaView-5.0.1/CMake/generate_qhp.cmake.orig 2016-03-28 17:06:22.000000000 +0200
|
|
+++ ParaView-5.0.1/CMake/generate_qhp.cmake 2016-12-13 17:21:25.382720945 +0100
|
|
@@ -44,7 +48,9 @@
|
|
message(FATAL_ERROR "Missing one of the required arguments!!")
|
|
endif ()
|
|
|
|
-string (REPLACE "+" ";" file_patterns "${file_patterns}")
|
|
+# Recover original ';' separated list.
|
|
+string(REPLACE "_s" ";" file_patterns "${file_patterns}")
|
|
+string(REPLACE "_u" "_" file_patterns "${file_patterns}")
|
|
|
|
get_filename_component(working_dir "${output_file}" PATH)
|
|
|
|
--- ParaView-5.0.1/CMake/ParaViewMacros.cmake.orig 2016-03-28 17:07:03.000000000 +0200
|
|
+++ ParaView-5.0.1/CMake/ParaViewMacros.cmake 2016-12-13 17:21:25.382720945 +0100
|
|
@@ -219,15 +226,21 @@
|
|
set (xmls_string "")
|
|
foreach (xml ${xmls})
|
|
get_filename_component(xml "${xml}" ABSOLUTE)
|
|
- set (xmls_string "${xmls_string}${xml}+")
|
|
+ set (xmls_string "${xmls_string}${xml};")
|
|
endforeach()
|
|
|
|
set (gui_xmls_string "")
|
|
foreach (gui_xml ${gui_xmls})
|
|
get_filename_component(gui_xml "${gui_xml}" ABSOLUTE)
|
|
- set (gui_xmls_string "${gui_xmls_string}${gui_xml}+")
|
|
+ set (gui_xmls_string "${gui_xmls_string}${gui_xml};")
|
|
endforeach()
|
|
|
|
+ # Escape ';' in lists
|
|
+ string(REPLACE "_" "_u" xmls_string "${xmls_string}")
|
|
+ string(REPLACE ";" "_s" xmls_string "${xmls_string}")
|
|
+ string(REPLACE "_" "_u" gui_xmls_string "${gui_xmls_string}")
|
|
+ string(REPLACE ";" "_s" gui_xmls_string "${gui_xmls_string}")
|
|
+
|
|
set (all_xmls ${xmls} ${gui_xmls})
|
|
list (GET all_xmls 0 first_xml)
|
|
if (NOT first_xml)
|
|
--- ParaView-5.0.1/CMake/generate_proxydocumentation.cmake.orig 2016-03-28 17:06:22.000000000 +0200
|
|
+++ ParaView-5.0.1/CMake/generate_proxydocumentation.cmake 2016-12-13 17:21:25.382720945 +0100
|
|
@@ -21,8 +21,10 @@
|
|
endif()
|
|
|
|
# input_xmls is a pseudo-list. Convert it to a real CMake list.
|
|
-string(REPLACE "+" ";" input_xmls "${input_xmls}")
|
|
-string(REPLACE "+" ";" input_gui_xmls "${input_gui_xmls}")
|
|
+string(REPLACE "_s" ";" input_xmls "${input_xmls}")
|
|
+string(REPLACE "_u" "_" input_xmls "${input_xmls}")
|
|
+string(REPLACE "_s" ";" input_gui_xmls "${input_gui_xmls}")
|
|
+string(REPLACE "_u" "_" input_gui_xmls "${input_gui_xmls}")
|
|
|
|
set (xslt_xml)
|
|
|