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)
45 lines
2.1 KiB
Plaintext
45 lines
2.1 KiB
Plaintext
--- ParaView-4.4.0/VTK/IO/Geometry/vtkSTLReader.cxx.orig 2015-09-11 19:59:24.000000000 +0200
|
|
+++ ParaView-4.4.0/VTK/IO/Geometry/vtkSTLReader.cxx 2016-06-19 12:59:50.769770143 +0200
|
|
@@ -448,7 +448,7 @@
|
|
done = done || (fscanf(fp,"%s", line)==EOF);
|
|
}
|
|
}
|
|
- if (!done)
|
|
+ else if (!done)
|
|
{
|
|
done = (fgets(line, 255, fp) == 0);
|
|
lineCount++;
|
|
--- 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-06-11 15:10:14.820958942 +0200
|
|
@@ -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-06-11 15:12:16.344357746 +0200
|
|
@@ -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-06-13 09:27:27.827849525 +0200
|
|
+++ ParaView-5.0.1/Qt/Components/CMakeLists.txt 2016-06-13 09:29:28.599318445 +0200
|
|
@@ -640,7 +640,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()
|