]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Unify the behaviour of the Find-Modules
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 16 Oct 2012 16:23:23 +0000 (16:23 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 16 Oct 2012 16:23:23 +0000 (16:23 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@27136 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/cmake/modules/FindAMD.cmake
deal.II/cmake/modules/FindARPACK.cmake
deal.II/cmake/modules/FindHDF5.cmake
deal.II/cmake/modules/FindMUMPS.cmake
deal.II/cmake/modules/FindNETCDF.cmake
deal.II/cmake/modules/FindP4EST.cmake
deal.II/cmake/modules/FindSCALAPACK.cmake
deal.II/cmake/modules/FindSUITESPARSECONFIG.cmake
deal.II/cmake/modules/FindTBB.cmake

index 395556dcef8189548819053889e8f359537b9303..3a31d2ca86a012ee333bcefb5d62cac933cb8f76 100644 (file)
@@ -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(
index 3311abc921585b022084374e148091966eb2cfe2..e45e01fb08b2bc3d6f2c9bf2cda8ff10b06b51bc 100644 (file)
@@ -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}
index 35d14bbbaa2587c04197e3c6a81e5537abb2a87a..913df2adc84b0b93e7d4910156ed35b006c45ffe 100644 (file)
@@ -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()
 
index 15f3ecfa61b5aaa7f2b1dc45f803d62498d0e6da..6df5347d36943a5e32536bffc136f04407560c3d 100644 (file)
@@ -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()
 
index 5fa8049b10105fe24febd402841a2a1b960c4135..75d521a19688811d2bad0950d1ac6eab6c7aa2b7 100644 (file)
 
 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(
index b9fac0f009f25ef412a335dae9a0c07ee30731c9..1d25b383f768a7b146aeadd51d2a17fd2888a82a 100644 (file)
@@ -62,7 +62,6 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(P4EST DEFAULT_MSG
   )
 
 IF(P4EST_FOUND)
-
   #
   # Determine mpi support of p4est:
   #
index 05af088d5f7008bc75a6bd0fdaf151ba2decd059..773ea44b845dab7118d68e545f146eaea14d301e 100644 (file)
@@ -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()
 
index f26dd7e9e62d53b9f8f5402cf62f90e1a70335be..657fe0f073ad60d785b50557d39ce196758515dd 100644 (file)
@@ -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
index 882669d5f27bfbf12772517a0180dd116967b080..e3f5afa2caf7cf14a7faefc2b2a5f332ef533995 100644 (file)
 
 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(

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.