]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
A bunch of bugfixes. And remove some superfluous search hints
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Sun, 16 Sep 2012 18:57:56 +0000 (18:57 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Sun, 16 Sep 2012 18:57:56 +0000 (18:57 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26417 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/contrib/cmake/modules/FindAMD.cmake
deal.II/contrib/cmake/modules/FindMETIS.cmake
deal.II/contrib/cmake/modules/FindNETCDF.cmake
deal.II/contrib/cmake/modules/FindTBB.cmake
deal.II/contrib/cmake/modules/FindUMFPACK.cmake
deal.II/source/lac/sparsity_tools.cc

index b595db9829c84ea4d3b8142e0228f6075530d0e4..db1804082361fd84e9cac06d49f7401c934a8352 100644 (file)
@@ -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
 )
 
index 881d6cb068f001aa16f311f02c33a5f9baa337e5..fec10fad51d43481864cf560f272c4a4ac8bf1de 100644 (file)
@@ -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
 )
 
index b68b318cdcf5aeb9cdc30228e6d9e6cc7d294fc1..9ac138df4b467fba087e328172ee39d4507579d2 100644 (file)
@@ -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
 )
 
index 66dfc7ac4417ff98ec1aeeed06765d458f74964b..99055019bb2203ea445ccb8cd9fbb534bb72fa77 100644 (file)
@@ -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
 )
 
index be0c325eed0fe9df3b8b3ab51ac825cb3d0f3187..723129dead5fee11b94fcb11f23a1e29bac47952 100644 (file)
@@ -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
 )
 
index 81d4168d5bc80ba0c34fd7580ec5329613c6ac13..8a294d6a73032320f02acfa587e7237e785463b4 100644 (file)
@@ -28,7 +28,7 @@
 #ifdef DEAL_II_USE_METIS
 extern "C"
 {
-#include <metis/metis.h>
+#include <metis.h>
 }
 #endif
 

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.