Harden cmake regexes when looking for #define strings.

cmake/configure/configure_2_boost.cmake

@@ -118,7 +118,7 @@ MACRO(FEATURE_BOOST_CONFIGURE_BUNDLED)
   #
   FILE(STRINGS "${BOOST_BUNDLED_INCLUDE_DIRS}/boost/version.hpp"
     BOOST_VERSION_STRING
-    REGEX "#define.*BOOST_VERSION")
+    REGEX "^[ \t]*#[ \t]*define.*BOOST_VERSION")
 
   STRING(REGEX REPLACE "^.*BOOST_VERSION.* ([0-9]+).*" "\\1"
     BOOST_VERSION_NUMBER "${BOOST_VERSION_STRING}"

cmake/modules/FindADOLC.cmake

@@ -57,7 +57,7 @@ IF(EXISTS ${ADOLC_SETTINGS_H})
   # Check whether ADOL-C is configured with extra trig functions
   #
   FILE(STRINGS "${ADOLC_SETTINGS_H}" ADOLC_ATRIG_ERF_STRING
-    REGEX "#define ATRIG_ERF"
+    REGEX "^[ \t]*#[ \t]*define ATRIG_ERF"
     )
   IF(NOT "${ADOLC_ATRIG_ERF_STRING}" STREQUAL "")
     SET(ADOLC_WITH_ATRIG_ERF TRUE)
@@ -69,7 +69,7 @@ IF(EXISTS ${ADOLC_SETTINGS_H})
   # Check whether ADOL-C is configured with advanced branching
   #
   FILE(STRINGS "${ADOLC_SETTINGS_H}" ADOLC_ADVANCED_BRANCHING_STRING
-    REGEX "#define ADOLC_ADVANCED_BRANCHING"
+    REGEX "^[ \t]*#[ \t]*define ADOLC_ADVANCED_BRANCHING"
     )
   IF(NOT "${ADOLC_ADVANCED_BRANCHING_STRING}" STREQUAL "")
     SET(ADOLC_WITH_ADVANCED_BRANCHING TRUE)
@@ -81,7 +81,7 @@ IF(EXISTS ${ADOLC_SETTINGS_H})
   # Check whether ADOL-C is configured with tapeless number reference counting
   #
   FILE(STRINGS "${ADOLC_SETTINGS_H}" ADOLC_WITH_TAPELESS_REFCOUNTING_STRING
-    REGEX "#define USE_ADTL_REFCOUNTING 1"
+    REGEX "^[ \t]*#[ \t]*define USE_ADTL_REFCOUNTING 1"
     )
   IF(NOT "${ADOLC_WITH_TAPELESS_REFCOUNTING_STRING}" STREQUAL "")
     SET(ADOLC_WITH_TAPELESS_REFCOUNTING TRUE)
@@ -93,7 +93,7 @@ IF(EXISTS ${ADOLC_SETTINGS_H})
   # Check whether ADOL-C is configured to use the Boost pool allocator
   #
   FILE(STRINGS "${ADOLC_SETTINGS_H}" ADOLC_BOOST_POOL_STRING
-    REGEX "#define USE_BOOST_POOL 1"
+    REGEX "^[ \t]*#[ \t]*define USE_BOOST_POOL 1"
     )
   IF(NOT "${ADOLC_BOOST_POOL_STRING}" STREQUAL "")
     SET(ADOLC_WITH_BOOST_ALLOCATOR TRUE)

cmake/modules/FindGSL.cmake

@@ -63,7 +63,7 @@ DEAL_II_FIND_PATH(GSL_INCLUDE_DIR gsl/gsl_version.h
 
 IF(EXISTS "${GSL_INCLUDE_DIR}/gsl/gsl_version.h" )
   FILE(STRINGS "${GSL_INCLUDE_DIR}/gsl/gsl_version.h" GSL_VERSION_STRING_LINE
-    REGEX "#define GSL_VERSION"
+    REGEX "^[ \t]*#[ \t]*define GSL_VERSION"
     )
   STRING(REGEX REPLACE ".*([0-9].[0-9]+).*" "\\1" GSL_VERSION
     "${GSL_VERSION_STRING_LINE}"

cmake/modules/FindMPI.cmake

@@ -99,12 +99,12 @@ DEAL_II_FIND_FILE(MPI_MPI_H
   )
 IF(NOT MPI_MPI_H MATCHES "-NOTFOUND" AND NOT DEFINED MPI_VERSION)
   FILE(STRINGS "${MPI_MPI_H}" MPI_VERSION_MAJOR_STRING
-    REGEX "#define.*MPI_VERSION")
+    REGEX "^[ \t]*#[ \t]*define.*MPI_VERSION")
   STRING(REGEX REPLACE "^.*MPI_VERSION[ ]+([0-9]+).*" "\\1"
     MPI_VERSION_MAJOR "${MPI_VERSION_MAJOR_STRING}"
     )
   FILE(STRINGS ${MPI_MPI_H} MPI_VERSION_MINOR_STRING
-    REGEX "#define.*MPI_SUBVERSION")
+    REGEX "^[ \t]*#[ \t]*define.*MPI_SUBVERSION")
   STRING(REGEX REPLACE "^.*MPI_SUBVERSION[ ]+([0-9]+).*" "\\1"
     MPI_VERSION_MINOR "${MPI_VERSION_MINOR_STRING}"
     )

cmake/modules/FindMUPARSER.cmake

@@ -45,7 +45,7 @@ IF(EXISTS ${MUPARSER_INCLUDE_DIR}/muParserDef.h)
     # Try to match the line
     #
     #     #define MUP_VERSION _T("2.2.4")
-    REGEX "#define MUP_VERSION _T"
+    REGEX "^[ \t]*#[ \t]*define MUP_VERSION _T"
     )
 
   IF("${MUPARSER_VERSION_STRING_LINE}" STREQUAL "")

cmake/modules/FindOPENCASCADE.cmake

@@ -43,7 +43,7 @@ DEAL_II_FIND_PATH(OPENCASCADE_INCLUDE_DIR Standard_Version.hxx
 
 IF(EXISTS ${OPENCASCADE_INCLUDE_DIR}/Standard_Version.hxx)
   FILE(STRINGS "${OPENCASCADE_INCLUDE_DIR}/Standard_Version.hxx" OPENCASCADE_VERSION
-    REGEX "#define OCC_VERSION_COMPLETE "
+    REGEX "^[ \t]*#[ \t]*define OCC_VERSION_COMPLETE "
     )
   STRING(REGEX REPLACE
     "#define OCC_VERSION_COMPLETE.*\"(.*)\"" "\\1"

cmake/modules/FindP4EST.cmake

@@ -112,10 +112,10 @@ IF(EXISTS ${P4EST_INCLUDE_DIR}/p4est_config.h)
   # Determine mpi support of p4est:
   #
   FILE(STRINGS "${P4EST_INCLUDE_DIR}/p4est_config.h" P4EST_MPI_STRING
-    REGEX "#define.*P4EST_MPI 1")
+    REGEX "^[ \t]*#[ \t]*define.*P4EST_MPI 1")
   IF("${P4EST_MPI_STRING}" STREQUAL "")
     FILE(STRINGS "${P4EST_INCLUDE_DIR}/p4est_config.h" P4EST_MPI_STRING
-      REGEX "#define.*P4EST_ENABLE_MPI")
+      REGEX "^[ \t]*#[ \t]*define.*P4EST_ENABLE_MPI")
     IF("${P4EST_MPI_STRING}" STREQUAL "")
       SET(P4EST_WITH_MPI FALSE)
     ELSE()
@@ -129,7 +129,7 @@ IF(EXISTS ${P4EST_INCLUDE_DIR}/p4est_config.h)
   # Is p4est built against zlib?
   #
   FILE(STRINGS "${P4EST_INCLUDE_DIR}/p4est_config.h" P4EST_ZLIB_STRING
-    REGEX "^#define.*P4EST_HAVE_ZLIB")
+    REGEX "^[ \t]*#[ \t]*define.*P4EST_HAVE_ZLIB")
   IF("${P4EST_ZLIB_STRING}" STREQUAL "")
     SET(P4EST_WITH_ZLIB FALSE)
   ELSE()
@@ -140,7 +140,7 @@ IF(EXISTS ${P4EST_INCLUDE_DIR}/p4est_config.h)
   # Is binary vtk output enabled?
   #
   FILE(STRINGS "${P4EST_INCLUDE_DIR}/p4est_config.h" P4EST_VTK_BINARY_STRING
-    REGEX "#define.*P4EST_ENABLE_VTK_BINARY 1")
+    REGEX "^[ \t]*#[ \t]*define.*P4EST_ENABLE_VTK_BINARY 1")
   IF("${P4EST_VTK_BINARY_STRING}" STREQUAL "")
     SET(P4EST_WITH_VTK_BINARY FALSE)
   ELSE()
@@ -151,7 +151,7 @@ IF(EXISTS ${P4EST_INCLUDE_DIR}/p4est_config.h)
   # Does p4est have search local?
   #
   FILE(STRINGS "${P4EST_INCLUDE_DIR}/p4est_base.h" P4EST_SEARCH_LOCAL_STRING
-    REGEX "#define.*P4EST_SEARCH_LOCAL")
+    REGEX "^[ \t]*#[ \t]*define.*P4EST_SEARCH_LOCAL")
   IF("${P4EST_SEARCH_LOCAL_STRING}" STREQUAL "")
     SET(P4EST_WITH_SEARCH_LOCAL FALSE)
   ELSE()
@@ -162,7 +162,7 @@ IF(EXISTS ${P4EST_INCLUDE_DIR}/p4est_config.h)
   # Extract version numbers:
   #
   FILE(STRINGS "${P4EST_INCLUDE_DIR}/p4est_config.h" P4EST_VERSION
-    REGEX "#define P4EST_VERSION \"")
+    REGEX "^[ \t]*#[ \t]*define P4EST_VERSION \"")
   STRING(REGEX REPLACE "^.*P4EST_VERSION.*\"([0-9]+.*)\".*" "\\1"
     P4EST_VERSION "${P4EST_VERSION}"
     )

cmake/modules/FindPETSC.cmake

@@ -95,22 +95,22 @@ DEAL_II_FIND_PATH(PETSC_INCLUDE_DIR_COMMON petscversion.h
 SET(PETSC_PETSCVERSION_H "${PETSC_INCLUDE_DIR_COMMON}/petscversion.h")
 IF(EXISTS ${PETSC_PETSCVERSION_H})
   FILE(STRINGS "${PETSC_PETSCVERSION_H}" PETSC_VERSION_MAJOR_STRING
-    REGEX "#define.*PETSC_VERSION_MAJOR")
+    REGEX "^[ \t]*#[ \t]*define.*PETSC_VERSION_MAJOR")
   STRING(REGEX REPLACE "^.*PETSC_VERSION_MAJOR.* ([0-9]+).*" "\\1"
     PETSC_VERSION_MAJOR "${PETSC_VERSION_MAJOR_STRING}"
     )
   FILE(STRINGS "${PETSC_PETSCVERSION_H}" PETSC_VERSION_MINOR_STRING
-    REGEX "#define.*PETSC_VERSION_MINOR")
+    REGEX "^[ \t]*#[ \t]*define.*PETSC_VERSION_MINOR")
   STRING(REGEX REPLACE "^.*PETSC_VERSION_MINOR.* ([0-9]+).*" "\\1"
     PETSC_VERSION_MINOR "${PETSC_VERSION_MINOR_STRING}"
     )
   FILE(STRINGS "${PETSC_PETSCVERSION_H}" PETSC_VERSION_SUBMINOR_STRING
-    REGEX "#define.*PETSC_VERSION_SUBMINOR")
+    REGEX "^[ \t]*#[ \t]*define.*PETSC_VERSION_SUBMINOR")
   STRING(REGEX REPLACE "^.*PETSC_VERSION_SUBMINOR.* ([0-9]+).*" "\\1"
     PETSC_VERSION_SUBMINOR "${PETSC_VERSION_SUBMINOR_STRING}"
     )
   FILE(STRINGS "${PETSC_PETSCVERSION_H}" PETSC_VERSION_PATCH_STRING
-    REGEX "#define.*PETSC_VERSION_PATCH")
+    REGEX "^[ \t]*#[ \t]*define.*PETSC_VERSION_PATCH")
   STRING(REGEX REPLACE "^.*PETSC_VERSION_PATCH.* ([0-9]+).*" "\\1"
     PETSC_VERSION_PATCH "${PETSC_VERSION_PATCH_STRING}"
     )

cmake/modules/FindSLEPC.cmake

@@ -65,22 +65,22 @@ DEAL_II_FIND_PATH(SLEPC_INCLUDE_DIR_COMMON slepcversion.h
 SET(SLEPC_SLEPCVERSION_H "${SLEPC_INCLUDE_DIR_COMMON}/slepcversion.h")
 IF(EXISTS ${SLEPC_SLEPCVERSION_H})
   FILE(STRINGS "${SLEPC_SLEPCVERSION_H}" SLEPC_VERSION_MAJOR_STRING
-    REGEX "#define.*SLEPC_VERSION_MAJOR")
+    REGEX "^[ \t]*#[ \t]*define.*SLEPC_VERSION_MAJOR")
   STRING(REGEX REPLACE "^.*SLEPC_VERSION_MAJOR.* ([0-9]+).*" "\\1"
     SLEPC_VERSION_MAJOR "${SLEPC_VERSION_MAJOR_STRING}"
     )
   FILE(STRINGS "${SLEPC_SLEPCVERSION_H}" SLEPC_VERSION_MINOR_STRING
-    REGEX "#define.*SLEPC_VERSION_MINOR")
+    REGEX "^[ \t]*#[ \t]*define.*SLEPC_VERSION_MINOR")
   STRING(REGEX REPLACE "^.*SLEPC_VERSION_MINOR.* ([0-9]+).*" "\\1"
     SLEPC_VERSION_MINOR "${SLEPC_VERSION_MINOR_STRING}"
     )
   FILE(STRINGS "${SLEPC_SLEPCVERSION_H}" SLEPC_VERSION_SUBMINOR_STRING
-    REGEX "#define.*SLEPC_VERSION_SUBMINOR")
+    REGEX "^[ \t]*#[ \t]*define.*SLEPC_VERSION_SUBMINOR")
   STRING(REGEX REPLACE "^.*SLEPC_VERSION_SUBMINOR.* ([0-9]+).*" "\\1"
     SLEPC_VERSION_SUBMINOR "${SLEPC_VERSION_SUBMINOR_STRING}"
     )
   FILE(STRINGS "${SLEPC_SLEPCVERSION_H}" SLEPC_VERSION_PATCH_STRING
-    REGEX "#define.*SLEPC_VERSION_PATCH")
+    REGEX "^[ \t]*#[ \t]*define.*SLEPC_VERSION_PATCH")
   STRING(REGEX REPLACE "^.*SLEPC_VERSION_PATCH.* ([0-9]+).*" "\\1"
     SLEPC_VERSION_PATCH "${SLEPC_VERSION_PATCH_STRING}"
     )

cmake/modules/FindSUNDIALS.cmake

@@ -99,19 +99,19 @@ DEAL_II_FIND_FILE(SUNDIALS_CONFIG_H
   )
 IF(NOT SUNDIALS_CONFIG_H MATCHES "-NOTFOUND")
   FILE(STRINGS "${SUNDIALS_CONFIG_H}" SUNDIALS_VERSION_MAJOR_STRING
-    REGEX "#define.*SUNDIALS_VERSION_MAJOR"
+    REGEX "^[ \t]*#[ \t]*define.*SUNDIALS_VERSION_MAJOR"
     )
   STRING(REGEX REPLACE "^.*SUNDIALS_VERSION_MAJOR.*([0-9]+).*" "\\1"
     SUNDIALS_VERSION_MAJOR "${SUNDIALS_VERSION_MAJOR_STRING}"
     )
   FILE(STRINGS "${SUNDIALS_CONFIG_H}" SUNDIALS_VERSION_MINOR_STRING
-    REGEX "#define.*SUNDIALS_VERSION_MINOR"
+    REGEX "^[ \t]*#[ \t]*define.*SUNDIALS_VERSION_MINOR"
     )
   STRING(REGEX REPLACE "^.*SUNDIALS_VERSION_MINOR.*([0-9]+).*" "\\1"
     SUNDIALS_VERSION_MINOR "${SUNDIALS_VERSION_MINOR_STRING}"
     )
   FILE(STRINGS "${SUNDIALS_CONFIG_H}" SUNDIALS_VERSION_PATCH_STRING
-    REGEX "#define.*SUNDIALS_VERSION_PATCH"
+    REGEX "^[ \t]*#[ \t]*define.*SUNDIALS_VERSION_PATCH"
     )
   STRING(REGEX REPLACE "^.*SUNDIALS_VERSION_PATCH.*([0-9]+).*" "\\1"
     SUNDIALS_VERSION_PATCH "${SUNDIALS_VERSION_PATCH_STRING}"

cmake/modules/FindSYMENGINE.cmake

@@ -70,17 +70,17 @@ ENDIF()
 IF(EXISTS ${SYMENGINE_SETTINGS_H})
 
   FILE(STRINGS "${SYMENGINE_SETTINGS_H}" SYMENGINE_VERSION_MAJOR_STRING
-    REGEX "#define.*SYMENGINE_MAJOR_VERSION")
+    REGEX "^[ \t]*#[ \t]*define.*SYMENGINE_MAJOR_VERSION")
   STRING(REGEX REPLACE "^.*SYMENGINE_MAJOR_VERSION.*([0-9]+).*" "\\1"
     SYMENGINE_VERSION_MAJOR "${SYMENGINE_VERSION_MAJOR_STRING}"
     )
   FILE(STRINGS "${SYMENGINE_SETTINGS_H}" SYMENGINE_VERSION_MINOR_STRING
-    REGEX "#define.*SYMENGINE_MINOR_VERSION")
+    REGEX "^[ \t]*#[ \t]*define.*SYMENGINE_MINOR_VERSION")
   STRING(REGEX REPLACE "^.*SYMENGINE_MINOR_VERSION.*([0-9]+).*" "\\1"
     SYMENGINE_VERSION_MINOR "${SYMENGINE_VERSION_MINOR_STRING}"
     )
   FILE(STRINGS "${SYMENGINE_SETTINGS_H}" SYMENGINE_VERSION_PATCH_STRING
-    REGEX "#define.*SYMENGINE_PATCH_VERSION")
+    REGEX "^[ \t]*#[ \t]*define.*SYMENGINE_PATCH_VERSION")
   STRING(REGEX REPLACE "^.*SYMENGINE_PATCH_VERSION.*([0-9]+).*" "\\1"
     SYMENGINE_VERSION_PATCH "${SYMENGINE_VERSION_PATCH_STRING}"
     )

cmake/modules/FindTBB.cmake

@@ -69,12 +69,12 @@ DEAL_II_FIND_PATH(TBB_INCLUDE_DIR tbb/tbb_stddef.h
 
 IF(EXISTS ${TBB_INCLUDE_DIR}/tbb/tbb_stddef.h)
   FILE(STRINGS "${TBB_INCLUDE_DIR}/tbb/tbb_stddef.h" TBB_VERSION_MAJOR_STRING
-    REGEX "#define.*TBB_VERSION_MAJOR")
+    REGEX "^[ \t]*#[ \t]*define.*TBB_VERSION_MAJOR")
   STRING(REGEX REPLACE "^.*TBB_VERSION_MAJOR +([0-9]+).*" "\\1"
     TBB_VERSION_MAJOR "${TBB_VERSION_MAJOR_STRING}"
     )
   FILE(STRINGS "${TBB_INCLUDE_DIR}/tbb/tbb_stddef.h" TBB_VERSION_MINOR_STRING
-    REGEX "#define.*TBB_VERSION_MINOR")
+    REGEX "^[ \t]*#[ \t]*define.*TBB_VERSION_MINOR")
   STRING(REGEX REPLACE "^.*TBB_VERSION_MINOR +([0-9]+).*" "\\1"
     TBB_VERSION_MINOR "${TBB_VERSION_MINOR_STRING}"
     )
@@ -97,12 +97,12 @@ ELSE()
 
   IF(EXISTS ${TBB_INCLUDE_DIR}/oneapi/tbb/version.h)
     FILE(STRINGS "${TBB_INCLUDE_DIR}/oneapi/tbb/version.h" TBB_VERSION_MAJOR_STRING
-      REGEX "#define.*TBB_VERSION_MAJOR")
+      REGEX "^[ \t]*#[ \t]*define.*TBB_VERSION_MAJOR")
     STRING(REGEX REPLACE "^.*TBB_VERSION_MAJOR +([0-9]+).*" "\\1"
       TBB_VERSION_MAJOR "${TBB_VERSION_MAJOR_STRING}"
       )
     FILE(STRINGS "${TBB_INCLUDE_DIR}/oneapi/tbb/version.h" TBB_VERSION_MINOR_STRING
-      REGEX "#define.*TBB_VERSION_MINOR")
+      REGEX "^[ \t]*#[ \t]*define.*TBB_VERSION_MINOR")
     STRING(REGEX REPLACE "^.*TBB_VERSION_MINOR +([0-9]+).*" "\\1"
       TBB_VERSION_MINOR "${TBB_VERSION_MINOR_STRING}"
       )

cmake/modules/FindTRILINOS.cmake

@@ -89,21 +89,21 @@ IF(EXISTS ${EPETRA_CONFIG_H})
   # Determine whether Trilinos was configured with MPI and 64bit indices:
   #
   FILE(STRINGS "${EPETRA_CONFIG_H}" EPETRA_MPI_STRING
-    REGEX "#define HAVE_MPI")
+    REGEX "^[ \t]*#[ \t]*define HAVE_MPI")
   IF("${EPETRA_MPI_STRING}" STREQUAL "")
     SET(TRILINOS_WITH_MPI FALSE)
   ELSE()
     SET(TRILINOS_WITH_MPI TRUE)
   ENDIF()
   FILE(STRINGS "${EPETRA_CONFIG_H}" EPETRA_32BIT_STRING
-    REGEX "#define EPETRA_NO_32BIT_GLOBAL_INDICES")
+    REGEX "^[ \t]*#[ \t]*define EPETRA_NO_32BIT_GLOBAL_INDICES")
   IF("${EPETRA_64BIT_STRING}" STREQUAL "")
     SET(TRILINOS_WITH_NO_32BITS_INDICES TRUE)
   ELSE()
     SET(TRILINOS_WITH_NO_32BITS_INDICES FALSE)
   ENDIF()
   FILE(STRINGS "${EPETRA_CONFIG_H}" EPETRA_64BIT_STRING
-    REGEX "#define EPETRA_NO_64BIT_GLOBAL_INDICES")
+    REGEX "^[ \t]*#[ \t]*define EPETRA_NO_64BIT_GLOBAL_INDICES")
   IF("${EPETRA_64BIT_STRING}" STREQUAL "")
     SET(TRILINOS_WITH_NO_64BITS_INDICES TRUE)
   ELSE()

cmake/modules/FindUMFPACK.cmake

@@ -88,17 +88,17 @@ IF(EXISTS ${UMFPACK_INCLUDE_DIR}/umfpack.h)
   ENDIF()
 
   FILE(STRINGS "${UMFPACK_INCLUDE_DIR}/umfpack.h" UMFPACK_VERSION_MAJOR_STRING
-    REGEX "#define.*UMFPACK_MAIN_VERSION")
+    REGEX "^[ \t]*#[ \t]*define.*UMFPACK_MAIN_VERSION")
   STRING(REGEX REPLACE "^.*UMFPACK_MAIN_VERSION.*([0-9]+).*" "\\1"
     UMFPACK_VERSION_MAJOR "${UMFPACK_VERSION_MAJOR_STRING}"
     )
   FILE(STRINGS "${UMFPACK_INCLUDE_DIR}/umfpack.h" UMFPACK_VERSION_MINOR_STRING
-    REGEX "#define.*UMFPACK_SUB_VERSION")
+    REGEX "^[ \t]*#[ \t]*define.*UMFPACK_SUB_VERSION")
   STRING(REGEX REPLACE "^.*UMFPACK_SUB_VERSION.*([0-9]+).*" "\\1"
     UMFPACK_VERSION_MINOR "${UMFPACK_VERSION_MINOR_STRING}"
     )
   FILE(STRINGS "${UMFPACK_INCLUDE_DIR}/umfpack.h" UMFPACK_VERSION_SUBMINOR_STRING
-    REGEX "#define.*UMFPACK_SUBSUB_VERSION")
+    REGEX "^[ \t]*#[ \t]*define.*UMFPACK_SUBSUB_VERSION")
   STRING(REGEX REPLACE "^.*UMFPACK_SUBSUB_VERSION.*([0-9]+).*" "\\1"
     UMFPACK_VERSION_SUBMINOR "${UMFPACK_VERSION_SUBMINOR_STRING}"
     )