From: Matthias Maier Date: Sun, 10 May 2020 20:23:33 +0000 (-0500) Subject: cmake: query p4est configuration for binary output X-Git-Tag: v9.2.0-rc1~40^2~2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=792be6115a905e027d2251f389ec30ef02794c26;p=dealii.git cmake: query p4est configuration for binary output --- diff --git a/cmake/configure/configure_p4est.cmake b/cmake/configure/configure_p4est.cmake index ede23871d1..7c6651b62b 100644 --- a/cmake/configure/configure_p4est.cmake +++ b/cmake/configure/configure_p4est.cmake @@ -75,5 +75,9 @@ MACRO(FEATURE_P4EST_FIND_EXTERNAL var) ENDIF() ENDMACRO() +MACRO(FEATURE_P4EST_CONFIGURE_EXTERNAL) + SET(DEAL_II_P4EST_WITH_VTK_BINARY ${P4EST_WITH_VTK_BINARY}) +ENDMACRO() + CONFIGURE_FEATURE(P4EST) diff --git a/cmake/modules/FindP4EST.cmake b/cmake/modules/FindP4EST.cmake index 155157a31c..d342bc5800 100644 --- a/cmake/modules/FindP4EST.cmake +++ b/cmake/modules/FindP4EST.cmake @@ -21,6 +21,7 @@ # P4EST_INCLUDE_DIRS # P4EST_WITH_MPI # P4EST_WITH_ZLIB +# P4EST_WITH_VTK_BINARY # P4EST_VERSION # P4EST_VERSION_MAJOR # P4EST_VERSION_MINOR @@ -128,6 +129,17 @@ IF(EXISTS ${P4EST_INCLUDE_DIR}/p4est_config.h) SET(P4EST_WITH_ZLIB TRUE) ENDIF() + # + # Is binary vtk output enabled? + # + FILE(STRINGS "${P4EST_INCLUDE_DIR}/p4est_config.h" P4EST_VTK_BINARY_STRING + REGEX "#define.*P4EST_ENABLE_VTK_BINARY 1") + IF("${P4EST_VTK_BINARY_STRING}" STREQUAL "") + SET(P4EST_WITH_VTK_BINARY FALSE) + ELSE() + SET(P4EST_WITH_VTK_BINARY TRUE) + ENDIF() + # # Extract version numbers: #