Merge branch 'it4i-salomon'

This commit is contained in:
Lukáš Krupčík 2020-08-21 13:45:54 +02:00
commit 5707e9ad93
2 changed files with 23 additions and 0 deletions

View File

@ -38,6 +38,10 @@ checksums = [
'320562de621a93bc173e6823968353f5ee2cbeac8623093a6057d76cb4315d05', # VTKData-8.1.0.tar.gz
]
#https://www.paraview.org/pipermail/paraview-developers/2017-March/005199.html
patches = ["VTK-8.1.0-foss-2018a-Python-3.6.6.patch"]
builddependencies = [('CMake', '3.11.4')]
dependencies = [

View File

@ -0,0 +1,19 @@
--- ThirdParty/hdf5/vtkhdf5/CMakeLists.txt.org 2020-08-17 15:13:30.938786723 +0200
+++ ThirdParty/hdf5/vtkhdf5/CMakeLists.txt 2020-08-17 15:14:07.401037024 +0200
@@ -412,14 +412,14 @@
# timezone is not included in time.h on mingw if -std=c99
set (CMAKE_C_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_C_FLAGS} -finline-functions -fno-common")
else ()
- set (CMAKE_C_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_C_FLAGS} -std=c99 -finline-functions -fno-common")
+ set (CMAKE_C_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_C_FLAGS} -std=gnu99 -finline-functions -fno-common")
endif()
else (CMAKE_BUILD_TYPE MATCHES Debug)
if (WIN32)
# timezone is not included in time.h on mingw if -std=c99
set (CMAKE_C_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_C_FLAGS} -fomit-frame-pointer -finline-functions -fno-common")
else ()
- set (CMAKE_C_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_C_FLAGS} -std=c99 -fomit-frame-pointer -finline-functions -fno-common")
+ set (CMAKE_C_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_C_FLAGS} -std=gnu99 -fomit-frame-pointer -finline-functions -fno-common")
endif ()
endif (CMAKE_BUILD_TYPE MATCHES Debug)
endif (CMAKE_COMPILER_IS_GNUCC)