From: maier Date: Tue, 16 Oct 2012 16:23:23 +0000 (+0000) Subject: Unify the behaviour of the Find-Modules X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=836118d3200326c26ce0141c59a911690dd389df;p=dealii-svn.git Unify the behaviour of the Find-Modules git-svn-id: https://svn.dealii.org/branches/branch_cmake@27136 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/cmake/modules/FindAMD.cmake b/deal.II/cmake/modules/FindAMD.cmake index 395556dcef..3a31d2ca86 100644 --- a/deal.II/cmake/modules/FindAMD.cmake +++ b/deal.II/cmake/modules/FindAMD.cmake @@ -35,7 +35,7 @@ FIND_PATH(AMD_INCLUDE_DIR amd.h ${UMFPACK_DIR}/../AMD/ PATH_SUFFIXES amd include/amd include Include AMD/Include -) + ) FIND_LIBRARY(AMD_LIBRARY NAMES amd @@ -47,7 +47,10 @@ FIND_LIBRARY(AMD_LIBRARY lib${LIB_SUFFIX} lib64 lib Lib AMD/Lib ) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(AMD DEFAULT_MSG AMD_LIBRARY AMD_INCLUDE_DIR) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(AMD DEFAULT_MSG + AMD_LIBRARY + AMD_INCLUDE_DIR + ) IF(AMD_FOUND) MARK_AS_ADVANCED( diff --git a/deal.II/cmake/modules/FindARPACK.cmake b/deal.II/cmake/modules/FindARPACK.cmake index 3311abc921..e45e01fb08 100644 --- a/deal.II/cmake/modules/FindARPACK.cmake +++ b/deal.II/cmake/modules/FindARPACK.cmake @@ -34,7 +34,7 @@ FIND_PACKAGE(LAPACK) FIND_LIBRARY(ARPACK_LIBRARY NAMES arpack PATH_SUFFIXES lib${LIB_SUFFIX} lib64 lib -) + ) SET(ARPACK_LIBRARIES ${ARPACK_LIBRARY} diff --git a/deal.II/cmake/modules/FindHDF5.cmake b/deal.II/cmake/modules/FindHDF5.cmake index 35d14bbbaa..913df2adc8 100644 --- a/deal.II/cmake/modules/FindHDF5.cmake +++ b/deal.II/cmake/modules/FindHDF5.cmake @@ -24,6 +24,8 @@ INCLUDE(FindPackageHandleStandardArgs) +SET_IF_EMPTY(HDF5_DIR "$ENV{HDF5_DIR}") + FIND_PATH(HDF5_INCLUDE_DIR hdf5.h HINTS ${HDF5_DIR} @@ -31,20 +33,24 @@ FIND_PATH(HDF5_INCLUDE_DIR hdf5.h hdf5 include/hdf5 include ) -FIND_LIBRARY(HDF5_LIBRARY - NAMES hdf5 - PATH_SUFFIXES lib${LIB_SUFFIX} lib64 lib -) +FIND_LIBRARY(HDF5_LIBRARY NAMES hdf5 + HINTS + ${HDF5_DIR} + PATH_SUFFIXES + lib${LIB_SUFFIX} lib64 lib + ) -FIND_LIBRARY(HDF5_HL_LIBRARY - NAMES hdf5_hl - PATH_SUFFIXES lib${LIB_SUFFIX} lib64 lib -) +FIND_LIBRARY(HDF5_HL_LIBRARY NAMES hdf5_hl + HINTS + ${HDF5_DIR} + PATH_SUFFIXES + lib${LIB_SUFFIX} lib64 lib + ) FIND_PACKAGE_HANDLE_STANDARD_ARGS(HDF5 DEFAULT_MSG - HDF5_INCLUDE_DIR HDF5_LIBRARY HDF5_HL_LIBRARY + HDF5_INCLUDE_DIR ) SET(HDF5_INCLUDE_DIRS @@ -69,9 +75,14 @@ ENDIF() IF(HDF5_FOUND) MARK_AS_ADVANCED( - HDF5_INCLUDE_DIR - HDF5_LIBRARY - HDF5_HL_LIBRARY - ) + HDF5_DIR + HDF5_LIBRARY + HDF5_HL_LIBRARY + HDF5_INCLUDE_DIR + ) +ELSE() + SET(HDF5_DIR "" CACHE STRING + "An optional hint to an hdf5 directory" + ) ENDIF() diff --git a/deal.II/cmake/modules/FindMUMPS.cmake b/deal.II/cmake/modules/FindMUMPS.cmake index 15f3ecfa61..6df5347d36 100644 --- a/deal.II/cmake/modules/FindMUMPS.cmake +++ b/deal.II/cmake/modules/FindMUMPS.cmake @@ -61,11 +61,11 @@ FIND_LIBRARY(MUMPS_COMMON_LIBRARY SET(MUMPS_LIBRARIES ${DMUMPS_LIBRARY} ${MUMPS_COMMON_LIBRARY} - ${LAPACK_LIBRARIES} + ${SCALAPACK_LIBRARIES} ) # -# If we can find libport.a (or similiar), link it in as well: +# If we can find libport.so (or similiar), link it in as well: # FIND_LIBRARY(PORD_LIBRARY NAMES port @@ -82,7 +82,7 @@ IF(NOT PORD_LIBRARY MATCHES "-NOTFOUND") ENDIF() SET(MUMPS_LINKER_FLAGS - ${LAPACK_LINKER_FLAGS} + ${SCALAPACK_LINKER_FLAGS} ) FIND_PACKAGE_HANDLE_STANDARD_ARGS(MUMPS DEFAULT_MSG @@ -98,5 +98,9 @@ IF(MUMPS_FOUND) MUMPS_INCLUDE_DIRS PORT_LIBRARY ) +ELSE() + SET(MUMPS_DIR "" CACHE STRING + "An optional hint to a mumps directory" + ) ENDIF() diff --git a/deal.II/cmake/modules/FindNETCDF.cmake b/deal.II/cmake/modules/FindNETCDF.cmake index 5fa8049b10..75d521a196 100644 --- a/deal.II/cmake/modules/FindNETCDF.cmake +++ b/deal.II/cmake/modules/FindNETCDF.cmake @@ -18,19 +18,21 @@ INCLUDE(FindPackageHandleStandardArgs) -FIND_PATH(NETCDF_INCLUDE_DIR netcdf.hh -) +FIND_PATH(NETCDF_INCLUDE_DIR netcdf.hh) # # TODO: netcdf might externally depend on hdf5. Check and fix this. # -FIND_LIBRARY(NETCDF_LIBRARY - NAMES netcdf_c++ netcdf_cpp - PATH_SUFFIXES lib${LIB_SUFFIX} lib64 lib -) +FIND_LIBRARY(NETCDF_LIBRARY NAMES netcdf_c++ netcdf_cpp + PATH_SUFFIXES + lib${LIB_SUFFIX} lib64 lib + ) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(NETCDF DEFAULT_MSG NETCDF_LIBRARY NETCDF_INCLUDE_DIR) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(NETCDF DEFAULT_MSG + NETCDF_LIBRARY + NETCDF_INCLUDE_DIR + ) IF(NETCDF_FOUND) MARK_AS_ADVANCED( diff --git a/deal.II/cmake/modules/FindP4EST.cmake b/deal.II/cmake/modules/FindP4EST.cmake index b9fac0f009..1d25b383f7 100644 --- a/deal.II/cmake/modules/FindP4EST.cmake +++ b/deal.II/cmake/modules/FindP4EST.cmake @@ -62,7 +62,6 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(P4EST DEFAULT_MSG ) IF(P4EST_FOUND) - # # Determine mpi support of p4est: # diff --git a/deal.II/cmake/modules/FindSCALAPACK.cmake b/deal.II/cmake/modules/FindSCALAPACK.cmake index 05af088d5f..773ea44b84 100644 --- a/deal.II/cmake/modules/FindSCALAPACK.cmake +++ b/deal.II/cmake/modules/FindSCALAPACK.cmake @@ -34,12 +34,12 @@ INCLUDE(FindPackageHandleStandardArgs) # FIND_PACKAGE(LAPACK) -FIND_LIBRARY(SCALAPACK_LIBRARY - NAMES scalapack +FIND_LIBRARY(SCALAPACK_LIBRARY NAMES scalapack HINTS ${SCALAPACK_DIR} - PATH_SUFFIXES lib${LIB_SUFFIX} lib64 lib -) + PATH_SUFFIXES + lib${LIB_SUFFIX} lib64 lib + ) SET(SCALAPACK_LIBRARIES ${SCALAPACK_LIBRARY} @@ -82,10 +82,19 @@ IF(SCALAPACK_FOUND) lapack_LIBRARY atlas_LIBRARY blas_LIBRARY + SCALAPACK_DIR SCALAPACK_LIBRARY + BLACS_DIR BLACS_LIBRARY BLACSCINIT_LIBRARY BLACSF77INIT_LIBRARY ) +ELSE() + SET(SCALAPACK_DIR "" CACHE STRING + "An optional hint to a SCALAPACK directory" + ) + SET(BLACS_DIR "" CACHE STRING + "An optional hint to a BLACS directory" + ) ENDIF() diff --git a/deal.II/cmake/modules/FindSUITESPARSECONFIG.cmake b/deal.II/cmake/modules/FindSUITESPARSECONFIG.cmake index f26dd7e9e6..657fe0f073 100644 --- a/deal.II/cmake/modules/FindSUITESPARSECONFIG.cmake +++ b/deal.II/cmake/modules/FindSUITESPARSECONFIG.cmake @@ -35,7 +35,7 @@ FIND_PATH(SUITESPARSECONFIG_INCLUDE_DIR SuiteSparse_config.h ${UMFPACK_DIR}/../SuiteSparse_config PATH_SUFFIXES include SuiteSparse_config -) + ) FIND_LIBRARY(SUITESPARSECONFIG_LIBRARY NAMES suitesparseconfig diff --git a/deal.II/cmake/modules/FindTBB.cmake b/deal.II/cmake/modules/FindTBB.cmake index 882669d5f2..e3f5afa2ca 100644 --- a/deal.II/cmake/modules/FindTBB.cmake +++ b/deal.II/cmake/modules/FindTBB.cmake @@ -18,21 +18,26 @@ INCLUDE(FindPackageHandleStandardArgs) -FIND_PATH(TBB_INCLUDE_DIR tbb/parallel_reduce.h -) +FIND_PATH(TBB_INCLUDE_DIR tbb/parallel_reduce.h) FIND_LIBRARY(TBB_LIBRARY NAMES tbb PATH_SUFFIXES lib${LIB_SUFFIX} lib64 lib -) + ) FIND_LIBRARY(TBB_DEBUG_LIBRARY NAMES tbb_debug PATH_SUFFIXES lib${LIB_SUFFIX} lib64 lib -) + ) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(TBB DEFAULT_MSG TBB_LIBRARY TBB_INCLUDE_DIR) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(TBB_DEBUG DEFAULT_MSG TBB_DEBUG_LIBRARY TBB_INCLUDE_DIR) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(TBB DEFAULT_MSG + TBB_LIBRARY + TBB_INCLUDE_DIR + ) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(TBB_DEBUG DEFAULT_MSG + TBB_DEBUG_LIBRARY + TBB_INCLUDE_DIR + ) IF(TBB_FOUND) MARK_AS_ADVANCED(