From: maier Date: Thu, 20 Sep 2012 09:14:26 +0000 (+0000) Subject: Bugfix: Use LIB_SUFFIX also in the Find modules X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58a71203a582cc8dc2175c642dec86ce93b10779;p=dealii-svn.git Bugfix: Use LIB_SUFFIX also in the Find modules git-svn-id: https://svn.dealii.org/branches/branch_cmake@26553 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/contrib/cmake/modules/FindAMD.cmake b/deal.II/contrib/cmake/modules/FindAMD.cmake index 4b90208439..57a7f191d9 100644 --- a/deal.II/contrib/cmake/modules/FindAMD.cmake +++ b/deal.II/contrib/cmake/modules/FindAMD.cmake @@ -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) diff --git a/deal.II/contrib/cmake/modules/FindARPACK.cmake b/deal.II/contrib/cmake/modules/FindARPACK.cmake index c98a121a82..48bac43087 100644 --- a/deal.II/contrib/cmake/modules/FindARPACK.cmake +++ b/deal.II/contrib/cmake/modules/FindARPACK.cmake @@ -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) diff --git a/deal.II/contrib/cmake/modules/FindMETIS.cmake b/deal.II/contrib/cmake/modules/FindMETIS.cmake index 7dfb4c76a4..a1dc23ed5a 100644 --- a/deal.II/contrib/cmake/modules/FindMETIS.cmake +++ b/deal.II/contrib/cmake/modules/FindMETIS.cmake @@ -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 ) # diff --git a/deal.II/contrib/cmake/modules/FindNETCDF.cmake b/deal.II/contrib/cmake/modules/FindNETCDF.cmake index 09c535fc75..752c887228 100644 --- a/deal.II/contrib/cmake/modules/FindNETCDF.cmake +++ b/deal.II/contrib/cmake/modules/FindNETCDF.cmake @@ -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) diff --git a/deal.II/contrib/cmake/modules/FindP4EST.cmake b/deal.II/contrib/cmake/modules/FindP4EST.cmake index af21eed2e2..8642303013 100644 --- a/deal.II/contrib/cmake/modules/FindP4EST.cmake +++ b/deal.II/contrib/cmake/modules/FindP4EST.cmake @@ -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) diff --git a/deal.II/contrib/cmake/modules/FindSC.cmake b/deal.II/contrib/cmake/modules/FindSC.cmake index 702f55f132..3d93f92243 100644 --- a/deal.II/contrib/cmake/modules/FindSC.cmake +++ b/deal.II/contrib/cmake/modules/FindSC.cmake @@ -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) diff --git a/deal.II/contrib/cmake/modules/FindTBB.cmake b/deal.II/contrib/cmake/modules/FindTBB.cmake index 34d11008ad..950adcbd46 100644 --- a/deal.II/contrib/cmake/modules/FindTBB.cmake +++ b/deal.II/contrib/cmake/modules/FindTBB.cmake @@ -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) diff --git a/deal.II/contrib/cmake/modules/FindUMFPACK.cmake b/deal.II/contrib/cmake/modules/FindUMFPACK.cmake index fe349e61fc..da92c6462d 100644 --- a/deal.II/contrib/cmake/modules/FindUMFPACK.cmake +++ b/deal.II/contrib/cmake/modules/FindUMFPACK.cmake @@ -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)