]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Bugfix: Use LIB_SUFFIX also in the Find modules
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 20 Sep 2012 09:14:26 +0000 (09:14 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 20 Sep 2012 09:14:26 +0000 (09:14 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26553 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/contrib/cmake/modules/FindAMD.cmake
deal.II/contrib/cmake/modules/FindARPACK.cmake
deal.II/contrib/cmake/modules/FindMETIS.cmake
deal.II/contrib/cmake/modules/FindNETCDF.cmake
deal.II/contrib/cmake/modules/FindP4EST.cmake
deal.II/contrib/cmake/modules/FindSC.cmake
deal.II/contrib/cmake/modules/FindTBB.cmake
deal.II/contrib/cmake/modules/FindUMFPACK.cmake

index 4b902084399f9e3465f5217d214cc4937e0d7166..57a7f191d93c278736e53d67d128149eb573508c 100644 (file)
@@ -9,7 +9,7 @@ FIND_PATH(AMD_INCLUDE_DIR amd.h
 
 FIND_LIBRARY(AMD_LIBRARY
   NAMES amd
-  PATH_SUFFIXES lib64 lib
+  PATH_SUFFIXES lib${LIB_SUFFIX} lib64 lib
 )
 
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(AMD DEFAULT_MSG AMD_LIBRARY AMD_INCLUDE_DIR)
index c98a121a82960c7bf3eead9aed56256d40dacba6..48bac430874ac46e956b320ec2ab10cefba10e7c 100644 (file)
@@ -6,7 +6,7 @@ INCLUDE(FindPackageHandleStandardArgs)
 
 FIND_LIBRARY(ARPACK_LIBRARY
   NAMES arpack
-  PATH_SUFFIXES lib64 lib
+  PATH_SUFFIXES lib${LIB_SUFFIX} lib64 lib
 )
 
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(ARPACK DEFAULT_MSG ARPACK_LIBRARY)
index 7dfb4c76a4de72f8f02dcdf1e6581c34b3e1edd8..a1dc23ed5a3bdcd9b81f9671cd4b0973200a8ebe 100644 (file)
@@ -10,7 +10,7 @@ FIND_PATH(METIS_INCLUDE_DIR metis.h
 
 FIND_LIBRARY(METIS_LIBRARY
   NAMES metis
-  PATH_SUFFIXES lib64 lib
+  PATH_SUFFIXES lib${LIB_SUFFIX} lib64 lib
   )
 
 #
index 09c535fc758afb3547ec61f4b62392eeed0892d7..752c887228e90675721dea8c989c6e405817e517 100644 (file)
@@ -9,7 +9,7 @@ FIND_PATH(NETCDF_INCLUDE_DIR netcdf.hh
 
 FIND_LIBRARY(NETCDF_LIBRARY
   NAMES netcdf_c++ netcdf_cpp
-  PATH_SUFFIXES lib64 lib
+  PATH_SUFFIXES lib${LIB_SUFFIX} lib64 lib
 )
 
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(NETCDF DEFAULT_MSG NETCDF_LIBRARY NETCDF_INCLUDE_DIR)
index af21eed2e20dca99865bec8e84216643f81db845..86423030132f25aec81e0baaf91a3687ed4578be 100644 (file)
@@ -8,12 +8,12 @@ FIND_PATH(P4EST_INCLUDE_DIR p4est.h)
 
 FIND_LIBRARY(P4EST_LIBRARY
   NAMES p4est
-  PATH_SUFFIXES lib64 lib
+  PATH_SUFFIXES lib${LIB_SUFFIX} lib64 lib
 )
 
 FIND_LIBRARY(P4EST_DEBUG_LIBRARY
   NAMES p4est_debug p4est.g
-  PATH_SUFFIXES lib64 lib
+  PATH_SUFFIXES lib${LIB_SUFFIX} lib64 lib
 )
 
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(P4EST DEFAULT_MSG P4EST_LIBRARY P4EST_INCLUDE_DIR)
index 702f55f132e4b41c644644a5973835a571e278f5..3d93f92243dde1dc9f70189063d8dc0d46fce131 100644 (file)
@@ -7,12 +7,12 @@ FIND_PATH(SC_INCLUDE_DIR sc.h)
 
 FIND_LIBRARY(SC_LIBRARY
   NAMES sc
-  PATH_SUFFIXES lib64 lib
+  PATH_SUFFIXES lib${LIB_SUFFIX} lib64 lib
 )
 
 FIND_LIBRARY(SC_DEBUG_LIBRARY
   NAMES sc_debug sc.g
-  PATH_SUFFIXES lib64 lib
+  PATH_SUFFIXES lib${LIB_SUFFIX} lib64 lib
 )
 
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(SC DEFAULT_MSG SC_LIBRARY SC_INCLUDE_DIR)
index 34d11008ada8252898e8c081b3dff92d87d1fd3b..950adcbd46dc69325a8a1df00f6c34b7646912a0 100644 (file)
@@ -9,12 +9,12 @@ FIND_PATH(TBB_INCLUDE_DIR tbb/parallel_reduce.h
 
 FIND_LIBRARY(TBB_LIBRARY
   NAMES tbb
-  PATH_SUFFIXES lib64 lib
+  PATH_SUFFIXES lib${LIB_SUFFIX} lib64 lib
 )
 
 FIND_LIBRARY(TBB_DEBUG_LIBRARY
   NAMES tbb_debug
-  PATH_SUFFIXES lib64 lib
+  PATH_SUFFIXES lib${LIB_SUFFIX} lib64 lib
 )
 
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(TBB DEFAULT_MSG TBB_LIBRARY TBB_INCLUDE_DIR)
index fe349e61fcc8af0b2bda3cd43bb1108985017c81..da92c6462dc18039fb00046a0c30e862cf528fc8 100644 (file)
@@ -9,7 +9,7 @@ FIND_PATH(UMFPACK_INCLUDE_DIR umfpack.h
 
 FIND_LIBRARY(UMFPACK_LIBRARY
   NAMES umfpack
-  PATH_SUFFIXES lib64 lib
+  PATH_SUFFIXES lib${LIB_SUFFIX} lib64 lib
 )
 
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(UMFPACK DEFAULT_MSG UMFPACK_LIBRARY UMFPACK_INCLUDE_DIR)

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.