CMake: Proof of conecpt:

  Be a bit more verbose about cached test results and print the FIND_*()
  parameter line if a search is unsuccessful

git-svn-id: https://svn.dealii.org/trunk@32907 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/cmake/macros/macro_configure_feature.cmake b/deal.II/cmake/macros/macro_configure_feature.cmake
index fa76a34841ca117bc5e38d88223b4ce110f12515..b42569ac1f946fe369e163f376573340a96f2885 100644 (file)
--- a/deal.II/cmake/macros/macro_configure_feature.cmake
+++ b/deal.II/cmake/macros/macro_configure_feature.cmake
@@ -169,6 +169,7 @@ MACRO(CONFIGURE_FEATURE _feature)
   #
   IF( (NOT DEAL_II_ALLOW_AUTODETECTION) AND
       (NOT DEFINED DEAL_II_WITH_${_feature}) )
+    PURGE_FEATURE(${_feature})
     SET_CACHED_OPTION(${_feature} OFF)
   ENDIF()
 
@@ -278,6 +279,7 @@ MACRO(CONFIGURE_FEATURE _feature)
     # DEAL_II_WITH_${_feature} is defined and set to OFF, promote it to
     # cache nevertheless:
     #
+    MESSAGE(STATUS "DEAL_II_WITH_${_feature} is set to off.")
     PURGE_FEATURE(${_feature})
     SET_CACHED_OPTION(${_feature} OFF)
   ENDIF()

diff --git a/deal.II/cmake/macros/macro_deal_ii_find_file.cmake b/deal.II/cmake/macros/macro_deal_ii_find_file.cmake
new file mode 100644 (file)
index 0000000..07652af
--- /dev/null
+++ b/deal.II/cmake/macros/macro_deal_ii_find_file.cmake
@@ -0,0 +1,31 @@
+## ---------------------------------------------------------------------
+## $Id$
+##
+## Copyright (C) 2014 by the deal.II authors
+##
+## This file is part of the deal.II library.
+##
+## The deal.II library is free software; you can use it, redistribute
+## it, and/or modify it under the terms of the GNU Lesser General
+## Public License as published by the Free Software Foundation; either
+## version 2.1 of the License, or (at your option) any later version.
+## The full text of the license can be found in the file LICENSE at
+## the top level of the deal.II distribution.
+##
+## ---------------------------------------------------------------------
+
+#
+# A small wrapper around FIND_FILE to be a bit more verbose
+#
+
+MACRO(DEAL_II_FIND_FILE _file_name)
+  FIND_FILE(${_file_name} ${ARGN})
+
+  IF(${_file_name} MATCHES "-NOTFOUND")
+    MESSAGE(STATUS "${_file_name} NOTFOUND! Call:")
+    TO_STRING(_str ${ARGN})
+    MESSAGE(STATUS "    FIND_FILE(${_file_name} ${_str})")
+  ELSE()
+    MESSAGE(STATUS "Found ${_file_name}")
+  ENDIF()
+ENDMACRO()

diff --git a/deal.II/cmake/macros/macro_deal_ii_find_library.cmake b/deal.II/cmake/macros/macro_deal_ii_find_library.cmake
new file mode 100644 (file)
index 0000000..63cac85
--- /dev/null
+++ b/deal.II/cmake/macros/macro_deal_ii_find_library.cmake
@@ -0,0 +1,31 @@
+## ---------------------------------------------------------------------
+## $Id$
+##
+## Copyright (C) 2014 by the deal.II authors
+##
+## This file is part of the deal.II library.
+##
+## The deal.II library is free software; you can use it, redistribute
+## it, and/or modify it under the terms of the GNU Lesser General
+## Public License as published by the Free Software Foundation; either
+## version 2.1 of the License, or (at your option) any later version.
+## The full text of the license can be found in the file LICENSE at
+## the top level of the deal.II distribution.
+##
+## ---------------------------------------------------------------------
+
+#
+# A small wrapper around FIND_LIBRARY to be a bit more verbose
+#
+
+MACRO(DEAL_II_FIND_LIBRARY _library_name)
+  FIND_LIBRARY(${_library_name} ${ARGN})
+
+  IF(${_library_name} MATCHES "-NOTFOUND")
+    MESSAGE(STATUS "${_library_name} NOTFOUND! Call:")
+    TO_STRING(_str ${ARGN})
+    MESSAGE(STATUS "    FIND_LIBRARY(${_library_name} ${_str})")
+  ELSE()
+    MESSAGE(STATUS "Found ${_library_name}")
+  ENDIF()
+ENDMACRO()

diff --git a/deal.II/cmake/macros/macro_deal_ii_find_path.cmake b/deal.II/cmake/macros/macro_deal_ii_find_path.cmake
new file mode 100644 (file)
index 0000000..40f6693
--- /dev/null
+++ b/deal.II/cmake/macros/macro_deal_ii_find_path.cmake
@@ -0,0 +1,31 @@
+## ---------------------------------------------------------------------
+## $Id$
+##
+## Copyright (C) 2014 by the deal.II authors
+##
+## This file is part of the deal.II library.
+##
+## The deal.II library is free software; you can use it, redistribute
+## it, and/or modify it under the terms of the GNU Lesser General
+## Public License as published by the Free Software Foundation; either
+## version 2.1 of the License, or (at your option) any later version.
+## The full text of the license can be found in the file LICENSE at
+## the top level of the deal.II distribution.
+##
+## ---------------------------------------------------------------------
+
+#
+# A small wrapper around FIND_FILE to be a bit more verbose
+#
+
+MACRO(DEAL_II_FIND_PATH _path_name)
+  FIND_PATH(${_path_name} ${ARGN})
+
+  IF(${_path_name} MATCHES "-NOTFOUND")
+    MESSAGE(STATUS "${_path_name} NOTFOUND! Call:")
+    TO_STRING(_str ${ARGN})
+    MESSAGE(STATUS "    FIND_PATH(${_path_name} ${_str})")
+  ELSE()
+    MESSAGE(STATUS "Found ${_path_name}")
+  ENDIF()
+ENDMACRO()

diff --git a/deal.II/cmake/modules/FindARPACK.cmake b/deal.II/cmake/modules/FindARPACK.cmake
index f87bb19c6433d653bc4b72d64b1717cbf6dbfcba..8efe5f5594a93c7686fd6da1b19f71383a1ec49b 100644 (file)
--- a/deal.II/cmake/modules/FindARPACK.cmake
+++ b/deal.II/cmake/modules/FindARPACK.cmake
@@ -30,7 +30,7 @@
 SET(ARPACK_DIR "" CACHE PATH "An optional hint to an ARPACK installation")
 SET_IF_EMPTY(ARPACK_DIR "$ENV{ARPACK_DIR}")
 
-FIND_LIBRARY(ARPACK_LIBRARY
+DEAL_II_FIND_LIBRARY(ARPACK_LIBRARY
   NAMES arpack
   HINTS ${ARPACK_DIR}
   PATH_SUFFIXES lib${LIB_SUFFIX} lib64 lib

diff --git a/deal.II/cmake/modules/FindHDF5.cmake b/deal.II/cmake/modules/FindHDF5.cmake
index 1b47573bf188a489463612ae7b3b06c02c5141e5..ae63b7145af184922381ff756bc62a53e84532f3 100644 (file)
--- a/deal.II/cmake/modules/FindHDF5.cmake
+++ b/deal.II/cmake/modules/FindHDF5.cmake
@@ -27,22 +27,22 @@
 SET(HDF5_DIR "" CACHE PATH "An optional hint to an hdf5 directory")
 SET_IF_EMPTY(HDF5_DIR "$ENV{HDF5_DIR}")
 
-FIND_PATH(HDF5_INCLUDE_DIR hdf5.h
+DEAL_II_FIND_PATH(HDF5_INCLUDE_DIR hdf5.h
   HINTS ${HDF5_DIR}
   PATH_SUFFIXES hdf5 hdf5/include include/hdf5 include
   )
 
-FIND_LIBRARY(HDF5_LIBRARY NAMES hdf5
+DEAL_II_FIND_LIBRARY(HDF5_LIBRARY NAMES hdf5
   HINTS ${HDF5_DIR}
   PATH_SUFFIXES hdf5/lib lib${LIB_SUFFIX} lib64 lib
   )
 
-FIND_LIBRARY(HDF5_HL_LIBRARY NAMES hdf5_hl
+DEAL_II_FIND_LIBRARY(HDF5_HL_LIBRARY NAMES hdf5_hl
   HINTS ${HDF5_DIR}
   PATH_SUFFIXES lib${LIB_SUFFIX} lib64 lib
   )
 
-FIND_FILE(HDF5_PUBCONF NAMES H5pubconf.h H5pubconf-64.h
+DEAL_II_FIND_FILE(HDF5_PUBCONF NAMES H5pubconf.h H5pubconf-64.h
   HINTS ${HDF5_INCLUDE_DIR} ${HDF5_DIR}
   PATH_SUFFIXES hdf5 hdf5/include include/hdf5 include
   )

diff --git a/deal.II/cmake/modules/FindMETIS.cmake b/deal.II/cmake/modules/FindMETIS.cmake
index 5f73bfdf92acaf71c76e3f66ca05d57267306f9f..080568dc251ea2302ce6ca0946bddd3ed3f517b4 100644 (file)
--- a/deal.II/cmake/modules/FindMETIS.cmake
+++ b/deal.II/cmake/modules/FindMETIS.cmake
@@ -37,7 +37,7 @@ SET_IF_EMPTY(METIS_DIR "$ENV{METIS_DIR}")
 # Link in MPI unconditionally (if found).
 #
 
-FIND_LIBRARY(METIS_LIBRARY
+DEAL_II_FIND_LIBRARY(METIS_LIBRARY
   NAMES metis
   HINTS ${METIS_DIR}
   PATH_SUFFIXES
@@ -51,7 +51,7 @@ FIND_LIBRARY(METIS_LIBRARY
 # the metis library...
 #
 GET_FILENAME_COMPONENT(_path "${METIS_LIBRARY}" PATH)
-FIND_LIBRARY(PARMETIS_LIBRARY
+DEAL_II_FIND_LIBRARY(PARMETIS_LIBRARY
   NAMES parmetis
   HINTS ${_path}
   NO_DEFAULT_PATH
@@ -62,7 +62,7 @@ FIND_LIBRARY(PARMETIS_LIBRARY
   NO_CMAKE_FIND_ROOT_PATH
   )
 
-FIND_PATH(METIS_INCLUDE_DIR metis.h
+DEAL_II_FIND_PATH(METIS_INCLUDE_DIR metis.h
   HINTS ${METIS_DIR}
   PATH_SUFFIXES metis include/metis include
   )

diff --git a/deal.II/cmake/modules/FindMUMPS.cmake b/deal.II/cmake/modules/FindMUMPS.cmake
index 697e2bbec1e4245ddf60e9d38d8f90b929c7c65d..e69bdac5a1297a85f7d7f1382901fd790950182d 100644 (file)
--- a/deal.II/cmake/modules/FindMUMPS.cmake
+++ b/deal.II/cmake/modules/FindMUMPS.cmake
@@ -39,7 +39,7 @@ SET_IF_EMPTY(BLACS_DIR "$ENV{BLACS_DIR}")
 # Search for scalapack:
 #
 
-FIND_LIBRARY(SCALAPACK_LIBRARY NAMES scalapack
+DEAL_II_FIND_LIBRARY(SCALAPACK_LIBRARY NAMES scalapack
   HINTS ${SCALAPACK_DIR}
   PATH_SUFFIXES lib${LIB_SUFFIX} lib64 lib
   )
@@ -51,7 +51,7 @@ FIND_LIBRARY(SCALAPACK_LIBRARY NAMES scalapack
 #
 FOREACH(_lib blacs blacsCinit blacsF77init)
   STRING(TOUPPER "${_lib}" _lib_upper)
-  FIND_LIBRARY(${_lib_upper}_LIBRARY
+  DEAL_II_FIND_LIBRARY(${_lib_upper}_LIBRARY
     NAMES ${_lib} ${_lib}_MPI-LINUX-0 ${_lib}_MPI-DARWIN-0
     HINTS ${BLACS_DIR} ${SCALAPACK_DIR} ${SCALAPACK_DIR}/../blacs/
     PATH_SUFFIXES lib${LIB_SUFFIX} lib64 lib LIB
@@ -62,18 +62,18 @@ ENDFOREACH()
 # Search for mumps:
 #
 
-FIND_PATH(MUMPS_INCLUDE_DIR dmumps_c.h
+DEAL_II_FIND_PATH(MUMPS_INCLUDE_DIR dmumps_c.h
   HINTS ${MUMPS_DIR}
   PATH_SUFFIXES mumps include/mumps include
   )
 
-FIND_LIBRARY(DMUMPS_LIBRARY
+DEAL_II_FIND_LIBRARY(DMUMPS_LIBRARY
   NAMES dmumps
   HINTS ${MUMPS_DIR}
   PATH_SUFFIXES lib${LIB_SUFFIX} lib64 lib
   )
 
-FIND_LIBRARY(MUMPS_COMMON_LIBRARY
+DEAL_II_FIND_LIBRARY(MUMPS_COMMON_LIBRARY
   NAMES mumps_common
   HINTS ${MUMPS_DIR}
   PATH_SUFFIXES lib${LIB_SUFFIX} lib64 lib
@@ -82,7 +82,7 @@ FIND_LIBRARY(MUMPS_COMMON_LIBRARY
 #
 # If we can find libport.so (or similiar), link it in as well:
 #
-FIND_LIBRARY(PORD_LIBRARY
+DEAL_II_FIND_LIBRARY(PORD_LIBRARY
   NAMES pord
   HINTS ${MUMPS_DIR}
   PATH_SUFFIXES lib${LIB_SUFFIX} lib64 lib

diff --git a/deal.II/cmake/modules/FindMUPARSER.cmake b/deal.II/cmake/modules/FindMUPARSER.cmake
index ce861d9f2c580302ed0d7af6d670ab5181f0b7e8..914a1a1d76b675059d341a3a2bf600fc2e9b6b23 100644 (file)
--- a/deal.II/cmake/modules/FindMUPARSER.cmake
+++ b/deal.II/cmake/modules/FindMUPARSER.cmake
@@ -30,13 +30,13 @@
 SET(MUPARSER_DIR "" CACHE PATH "An optional hint to a MUPARSER installation")
 SET_IF_EMPTY(MUPARSER_DIR "$ENV{MUPARSER_DIR}")
 
-FIND_LIBRARY(MUPARSER_LIBRARY
+DEAL_II_FIND_LIBRARY(MUPARSER_LIBRARY
   NAMES muparser muparserd
   HINTS ${MUPARSER_DIR}
   PATH_SUFFIXES lib${LIB_SUFFIX} lib64 lib
   )
 
-FIND_PATH(MUPARSER_INCLUDE_DIR muParserDef.h
+DEAL_II_FIND_PATH(MUPARSER_INCLUDE_DIR muParserDef.h
   HINTS ${MUPARSER_DIR}
   PATH_SUFFIXES include
   )

diff --git a/deal.II/cmake/modules/FindNETCDF.cmake b/deal.II/cmake/modules/FindNETCDF.cmake
index 55d802ff40aa539341089da788eb73ddd3d26805..b124ce7e7439a90d45384c02443cb1d1dbcef6ab 100644 (file)
--- a/deal.II/cmake/modules/FindNETCDF.cmake
+++ b/deal.II/cmake/modules/FindNETCDF.cmake
@@ -26,7 +26,7 @@
 SET(NETCDF_DIR "" CACHE PATH "An optional hint to a NETCDF installation")
 SET_IF_EMPTY(NETCDF_DIR "$ENV{NETCDF_DIR}")
 
-FIND_PATH(NETCDF_INCLUDE_DIR netcdfcpp.h
+DEAL_II_FIND_PATH(NETCDF_INCLUDE_DIR netcdfcpp.h
   HINTS ${NETCDF_DIR}
   PATH_SUFFIXES netcdf include
   )
@@ -38,12 +38,12 @@ FIND_PATH(NETCDF_INCLUDE_DIR netcdfcpp.h
 # - separate C++ and C library search
 #
 
-FIND_LIBRARY(NETCDF_CPLUSPLUS_LIBRARY NAMES netcdf_c++ netcdf_cpp
+DEAL_II_FIND_LIBRARY(NETCDF_CPLUSPLUS_LIBRARY NAMES netcdf_c++ netcdf_cpp
   HINTS ${NETCDF_DIR}
   PATH_SUFFIXES lib${LIB_SUFFIX} lib64 lib
   )
 
-FIND_LIBRARY(NETCDF_C_LIBRARY NAMES netcdf
+DEAL_II_FIND_LIBRARY(NETCDF_C_LIBRARY NAMES netcdf
   HINTS ${NETCDF_DIR}
   PATH_SUFFIXES lib${LIB_SUFFIX} lib64 lib
   )

diff --git a/deal.II/cmake/modules/FindP4EST.cmake b/deal.II/cmake/modules/FindP4EST.cmake
index 8246a0a5aa2f426bd924dc2161bac47e8b0d3618..640fb91c04183c8710f2a57dc13c611b4af4c844 100644 (file)
--- a/deal.II/cmake/modules/FindP4EST.cmake
+++ b/deal.II/cmake/modules/FindP4EST.cmake
@@ -39,7 +39,7 @@ SET_IF_EMPTY(SC_DIR "$ENV{SC_DIR}")
 # given, take what we chose for p4est.
 #
 
-FIND_PATH(SC_INCLUDE_DIR sc.h
+DEAL_II_FIND_PATH(SC_INCLUDE_DIR sc.h
   HINTS
     ${SC_DIR}/FAST
     ${SC_DIR}/DEBUG
@@ -51,13 +51,13 @@ FIND_PATH(SC_INCLUDE_DIR sc.h
     sc include/p4est include src sc/src
   )
 
-FIND_LIBRARY(P4EST_LIBRARY_OPTIMIZED
+DEAL_II_FIND_LIBRARY(P4EST_LIBRARY_OPTIMIZED
   NAMES p4est
   HINTS ${P4EST_DIR}/FAST ${P4EST_DIR}/DEBUG ${P4EST_DIR}
   PATH_SUFFIXES lib${LIB_SUFFIX} lib64 lib src
   )
 
-FIND_LIBRARY(SC_LIBRARY_OPTIMIZED
+DEAL_II_FIND_LIBRARY(SC_LIBRARY_OPTIMIZED
   NAMES sc
   HINTS
     ${SC_DIR}/FAST
@@ -74,13 +74,13 @@ FIND_LIBRARY(SC_LIBRARY_OPTIMIZED
 # Support debug variants as well:
 #
 
-FIND_LIBRARY(P4EST_LIBRARY_DEBUG
+DEAL_II_FIND_LIBRARY(P4EST_LIBRARY_DEBUG
   NAMES p4est
   HINTS ${P4EST_DIR}/DEBUG
   PATH_SUFFIXES lib${LIB_SUFFIX} lib64 lib src
   )
 
-FIND_LIBRARY(SC_LIBRARY_DEBUG
+DEAL_II_FIND_LIBRARY(SC_LIBRARY_DEBUG
   NAMES sc
   HINTS ${SC_DIR}/DEBUG ${P4EST_DIR}/DEBUG
   PATH_SUFFIXES lib${LIB_SUFFIX} lib64 lib src sc/src
@@ -100,7 +100,7 @@ ELSE()
 ENDIF()
 
 
-FIND_PATH(P4EST_INCLUDE_DIR p4est_config.h
+DEAL_II_FIND_PATH(P4EST_INCLUDE_DIR p4est_config.h
   HINTS ${P4EST_DIR}/FAST ${P4EST_DIR}/DEBUG ${P4EST_DIR}
   PATH_SUFFIXES p4est include/p4est include src
   )

diff --git a/deal.II/cmake/modules/FindPETSC.cmake b/deal.II/cmake/modules/FindPETSC.cmake
index 574c545f3e2e1aa0ef7a74c10eff3d8c51ce1b99..62b9068fcd1908b4d415dc278543eea1b24477fd 100644 (file)
--- a/deal.II/cmake/modules/FindPETSC.cmake
+++ b/deal.II/cmake/modules/FindPETSC.cmake
@@ -37,8 +37,8 @@ SET(PETSC_ARCH "" CACHE STRING "An optional hint to a PETSc arch")
 SET_IF_EMPTY(PETSC_DIR "$ENV{PETSC_DIR}")
 SET_IF_EMPTY(PETSC_ARCH "$ENV{PETSC_ARCH}")
 
-FIND_LIBRARY(PETSC_LIBRARY
-  NAMES petsc
+DEAL_II_FIND_LIBRARY(PETSC_LIBRARY
+  NAMES petscbob
   HINTS ${PETSC_DIR} ${PETSC_DIR}/${PETSC_ARCH}
   PATH_SUFFIXES lib${LIB_SUFFIX} lib64 lib
   )
@@ -47,7 +47,7 @@ FIND_LIBRARY(PETSC_LIBRARY
 # Search for the first part of the includes:
 #
 
-FIND_PATH(PETSC_INCLUDE_DIR_ARCH petscconf.h
+DEAL_II_FIND_PATH(PETSC_INCLUDE_DIR_ARCH petscconf.h
   HINTS ${PETSC_DIR} ${PETSC_DIR}/${PETSC_ARCH} ${PETSC_INCLUDE_DIRS}
   PATH_SUFFIXES petsc include include/petsc
 )
@@ -102,7 +102,7 @@ ENDIF()
 # Either way, we must be able to find petscversion.h:
 #
 
-FIND_PATH(PETSC_INCLUDE_DIR_COMMON petscversion.h
+DEAL_II_FIND_PATH(PETSC_INCLUDE_DIR_COMMON petscversion.h
   HINTS ${PETSC_DIR} ${PETSC_DIR}/${PETSC_ARCH} ${PETSC_INCLUDE_DIRS}
   PATH_SUFFIXES petsc include include/petsc
 )
@@ -140,7 +140,7 @@ ENDIF()
 # that file:
 #
 
-FIND_FILE(PETSC_PETSCVARIABLES
+DEAL_II_FIND_FILE(PETSC_PETSCVARIABLES
   NAMES petscvariables
   HINTS ${PETSC_DIR}/${PETSC_ARCH} ${PETSC_DIR}
   PATH_SUFFIXES conf
@@ -205,7 +205,7 @@ IF(NOT PETSC_PETSCVARIABLES MATCHES "-NOTFOUND")
           LIST(APPEND _petsc_libraries ${PETSC_LIBRARY_${_token}})
         ENDIF()
       ELSEIF(NOT _token MATCHES "(petsc|stdc\\+\\+|gcc_s)")
-        FIND_LIBRARY(PETSC_LIBRARY_${_token}
+        DEAL_II_FIND_LIBRARY(PETSC_LIBRARY_${_token}
           NAMES ${_token}
           HINTS ${_hints}
           )

diff --git a/deal.II/cmake/modules/FindSLEPC.cmake b/deal.II/cmake/modules/FindSLEPC.cmake
index f328927bdbd52d3525887df69dbd42efa647dcf8..c60154c0a83055ea77d151378a2245281bb89482 100644 (file)
--- a/deal.II/cmake/modules/FindSLEPC.cmake
+++ b/deal.II/cmake/modules/FindSLEPC.cmake
@@ -39,13 +39,13 @@ SET_IF_EMPTY(PETSC_ARCH "$ENV{PETSC_ARCH}")
 # mechanism.
 #
 
-FIND_LIBRARY(SLEPC_LIBRARY
+DEAL_II_FIND_LIBRARY(SLEPC_LIBRARY
   NAMES slepc
   HINTS ${SLEPC_DIR} ${SLEPC_DIR}/${PETSC_ARCH} ${PETSC_DIR}
   PATH_SUFFIXES lib${LIB_SUFFIX} lib64 lib
 )
 
-FIND_PATH(SLEPC_INCLUDE_DIR_ARCH slepcconf.h
+DEAL_II_FIND_PATH(SLEPC_INCLUDE_DIR_ARCH slepcconf.h
   HINTS
     ${SLEPC_DIR}
     ${SLEPC_DIR}/${PETSC_ARCH}
@@ -54,7 +54,7 @@ FIND_PATH(SLEPC_INCLUDE_DIR_ARCH slepcconf.h
   PATH_SUFFIXES slepc include include/slepc
 )
 
-FIND_PATH(SLEPC_INCLUDE_DIR_COMMON slepcversion.h
+DEAL_II_FIND_PATH(SLEPC_INCLUDE_DIR_COMMON slepcversion.h
   HINTS
     ${SLEPC_DIR}
     ${SLEPC_DIR}/${PETSC_ARCH}

diff --git a/deal.II/cmake/modules/FindTBB.cmake b/deal.II/cmake/modules/FindTBB.cmake
index 828626cbc619d98efd305ef25029bfae44b746e5..fe2cc824def165e25c4b10a73240060e3ccf6fe6 100644 (file)
--- a/deal.II/cmake/modules/FindTBB.cmake
+++ b/deal.II/cmake/modules/FindTBB.cmake
@@ -31,7 +31,7 @@ SET(TBB_DIR "" CACHE PATH "An optional hint to a TBB installation")
 SET_IF_EMPTY(TBB_DIR "$ENV{TBB_DIR}")
 
 FILE(GLOB _path ${TBB_DIR}/build/*_release)
-FIND_LIBRARY(TBB_LIBRARY
+DEAL_II_FIND_LIBRARY(TBB_LIBRARY
   NAMES tbb
   HINTS
     ${_path}
@@ -43,7 +43,7 @@ FIND_LIBRARY(TBB_LIBRARY
 # Also search for the debug library:
 #
 FILE(GLOB _path ${TBB_DIR}/build/*_debug)
-FIND_LIBRARY(TBB_DEBUG_LIBRARY
+DEAL_II_FIND_LIBRARY(TBB_DEBUG_LIBRARY
   NAMES tbb_debug
   HINTS
     ${_path}
@@ -57,7 +57,7 @@ ELSE()
   SET(_libraries TBB_LIBRARY)
 ENDIF()
 
-FIND_PATH(TBB_INCLUDE_DIR tbb/tbb_stddef.h
+DEAL_II_FIND_PATH(TBB_INCLUDE_DIR tbb/tbb_stddef.h
   HINTS
     ${TBB_DIR}
   PATH_SUFFIXES include include/tbb tbb

diff --git a/deal.II/cmake/modules/FindTRILINOS.cmake b/deal.II/cmake/modules/FindTRILINOS.cmake
index 526de882a57185fea8395bf446f6b7058835ab19..6fc8c408d4db01e6504bc4399b486a9e5357ef63 100644 (file)
--- a/deal.II/cmake/modules/FindTRILINOS.cmake
+++ b/deal.II/cmake/modules/FindTRILINOS.cmake
@@ -73,7 +73,7 @@ ENDIF()
 #
 # Look for the one include file that we'll query for further information:
 #
-FIND_FILE(EPETRA_CONFIG_H Epetra_config.h
+DEAL_II_FIND_FILE(EPETRA_CONFIG_H Epetra_config.h
   HINTS ${Trilinos_INCLUDE_DIRS}
   NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH
   NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH NO_CMAKE_FIND_ROOT_PATH
@@ -112,7 +112,7 @@ ENDIF()
 # Test whether that is indeed the case:
 #
 
-FIND_FILE(SACADO_CMATH_HPP Sacado_cmath.hpp
+DEAL_II_FIND_FILE(SACADO_CMATH_HPP Sacado_cmath.hpp
   HINTS ${Trilinos_INCLUDE_DIRS}
   NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH
   NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH NO_CMAKE_FIND_ROOT_PATH
@@ -160,7 +160,7 @@ STRING(REGEX REPLACE
 SET(_libraries "")
 FOREACH(_library ${Trilinos_LIBRARIES})
   LIST(APPEND _libraries TRILINOS_LIBRARY_${_library})
-  FIND_LIBRARY(TRILINOS_LIBRARY_${_library}
+  DEAL_II_FIND_LIBRARY(TRILINOS_LIBRARY_${_library}
     NAMES ${_library}
     HINTS ${Trilinos_LIBRARY_DIRS}
     NO_DEFAULT_PATH

diff --git a/deal.II/cmake/modules/FindUMFPACK.cmake b/deal.II/cmake/modules/FindUMFPACK.cmake
index 9db0d3546fefb79ae844a24d1cb891853e1c9849..675f95475df0f1e80a4f1f59db5cacbd6ad09557 100644 (file)
--- a/deal.II/cmake/modules/FindUMFPACK.cmake
+++ b/deal.II/cmake/modules/FindUMFPACK.cmake
@@ -43,7 +43,7 @@ ENDFOREACH()
 MACRO(FIND_UMFPACK_PATH _comp _file)
   STRING(TOLOWER ${_comp} _comp_lowercase)
   STRING(TOUPPER ${_comp} _comp_uppercase)
-  FIND_PATH(${_comp}_INCLUDE_DIR ${_file}
+  DEAL_II_FIND_PATH(${_comp}_INCLUDE_DIR ${_file}
     HINTS
       ${${_comp_uppercase}_DIR}
       ${SUITESPARSE_DIR}/${_comp}
@@ -57,7 +57,7 @@ ENDMACRO()
 
 MACRO(FIND_UMFPACK_LIBRARY _comp _name)
   STRING(TOUPPER ${_comp} _comp_uppercase)
-  FIND_LIBRARY(${_comp}_LIBRARY
+  DEAL_II_FIND_LIBRARY(${_comp}_LIBRARY
     NAMES ${_name}
     HINTS
       ${${_comp_uppercase}_DIR}