From 05b6cbfec6821ed03fe5a05d5453d916b9a3d51c Mon Sep 17 00:00:00 2001 From: maier Date: Sun, 16 Sep 2012 18:57:56 +0000 Subject: [PATCH] A bunch of bugfixes. And remove some superfluous search hints git-svn-id: https://svn.dealii.org/branches/branch_cmake@26417 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/contrib/cmake/modules/FindAMD.cmake | 2 -- deal.II/contrib/cmake/modules/FindMETIS.cmake | 9 ++++----- deal.II/contrib/cmake/modules/FindNETCDF.cmake | 2 -- deal.II/contrib/cmake/modules/FindTBB.cmake | 3 --- deal.II/contrib/cmake/modules/FindUMFPACK.cmake | 2 -- deal.II/source/lac/sparsity_tools.cc | 2 +- 6 files changed, 5 insertions(+), 15 deletions(-) diff --git a/deal.II/contrib/cmake/modules/FindAMD.cmake b/deal.II/contrib/cmake/modules/FindAMD.cmake index b595db9829..db18040823 100644 --- a/deal.II/contrib/cmake/modules/FindAMD.cmake +++ b/deal.II/contrib/cmake/modules/FindAMD.cmake @@ -5,14 +5,12 @@ INCLUDE(FindPackageHandleStandardArgs) FIND_PATH(AMD_INCLUDE_DIR amd.h HINTS $ENV{AMD_INCLUDE_DIR} - ${AMD_INCLUDE_DIR} ) FIND_LIBRARY(AMD_LIBRARY NAMES amd PATHS $ENV{AMD_LIBRARY_DIR} - ${AMD_LIBRARY_DIR} PATH_SUFFIXES lib64 lib ) diff --git a/deal.II/contrib/cmake/modules/FindMETIS.cmake b/deal.II/contrib/cmake/modules/FindMETIS.cmake index 881d6cb068..fec10fad51 100644 --- a/deal.II/contrib/cmake/modules/FindMETIS.cmake +++ b/deal.II/contrib/cmake/modules/FindMETIS.cmake @@ -2,17 +2,16 @@ INCLUDE(FindPackageHandleStandardArgs) -FIND_PATH(METIS_INCLUDE_DIR metis/metis.h +FIND_PATH(METIS_INCLUDE_DIR metis.h HINTS - $ENV{NETCDF_INCLUDE_DIR} - ${NETCDF_INCLUDE_DIR} + $ENV{METIS_INCLUDE_DIR} + PATH_SUFFIXES metis ) FIND_LIBRARY(METIS_LIBRARY NAMES metis PATHS - $ENV{NETCDF_LIBRARY_DIR} - ${NETCDF_LIBRARY_DIR} + $ENV{METIS_LIBRARY_DIR} PATH_SUFFIXES lib64 lib ) diff --git a/deal.II/contrib/cmake/modules/FindNETCDF.cmake b/deal.II/contrib/cmake/modules/FindNETCDF.cmake index b68b318cdc..9ac138df4b 100644 --- a/deal.II/contrib/cmake/modules/FindNETCDF.cmake +++ b/deal.II/contrib/cmake/modules/FindNETCDF.cmake @@ -5,14 +5,12 @@ INCLUDE(FindPackageHandleStandardArgs) FIND_PATH(NETCDF_INCLUDE_DIR netcdf.hh HINTS $ENV{NETCDF_INCLUDE_DIR} - ${NETCDF_INCLUDE_DIR} ) FIND_LIBRARY(NETCDF_LIBRARY NAMES netcdf_c++ netcdf_cpp PATHS $ENV{NETCDF_LIBRARY_DIR} - ${NETCDF_LIBRARY_DIR} PATH_SUFFIXES lib64 lib ) diff --git a/deal.II/contrib/cmake/modules/FindTBB.cmake b/deal.II/contrib/cmake/modules/FindTBB.cmake index 66dfc7ac44..99055019bb 100644 --- a/deal.II/contrib/cmake/modules/FindTBB.cmake +++ b/deal.II/contrib/cmake/modules/FindTBB.cmake @@ -5,14 +5,12 @@ INCLUDE(FindPackageHandleStandardArgs) FIND_PATH(TBB_INCLUDE_DIR tbb/parallel_reduce.h HINTS $ENV{TBB_INCLUDE_DIR} - ${TBB_INCLUDE_DIR} ) FIND_LIBRARY(TBB_LIBRARY NAMES tbb PATHS $ENV{TBB_LIBRARY_DIR} - ${TBB_LIBRARY_DIR} PATH_SUFFIXES lib64 lib ) @@ -20,7 +18,6 @@ FIND_LIBRARY(TBB_DEBUG_LIBRARY NAMES tbb_debug PATHS $ENV{TBB_DEBUG_LIBRARY_DIR} - ${TBB_DEBUG_LIBRARY_DIR} PATH_SUFFIXES lib64 lib ) diff --git a/deal.II/contrib/cmake/modules/FindUMFPACK.cmake b/deal.II/contrib/cmake/modules/FindUMFPACK.cmake index be0c325eed..723129dead 100644 --- a/deal.II/contrib/cmake/modules/FindUMFPACK.cmake +++ b/deal.II/contrib/cmake/modules/FindUMFPACK.cmake @@ -5,14 +5,12 @@ INCLUDE(FindPackageHandleStandardArgs) FIND_PATH(UMFPACK_INCLUDE_DIR umfpack.h HINTS $ENV{UMFPACK_INCLUDE_DIR} - ${UMFPACK_INCLUDE_DIR} ) FIND_LIBRARY(UMFPACK_LIBRARY NAMES umfpack PATHS $ENV{UMFPACK_LIBRARY_DIR} - ${UMFPACK_LIBRARY_DIR} PATH_SUFFIXES lib64 lib ) diff --git a/deal.II/source/lac/sparsity_tools.cc b/deal.II/source/lac/sparsity_tools.cc index 81d4168d5b..8a294d6a73 100644 --- a/deal.II/source/lac/sparsity_tools.cc +++ b/deal.II/source/lac/sparsity_tools.cc @@ -28,7 +28,7 @@ #ifdef DEAL_II_USE_METIS extern "C" { -#include +#include } #endif -- 2.39.5