]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
A bunch of code cleanup
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 16 Jan 2013 17:51:03 +0000 (17:51 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 16 Jan 2013 17:51:03 +0000 (17:51 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@28080 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/cmake/configure/configure_metis.cmake
deal.II/cmake/modules/FindARPACK.cmake
deal.II/cmake/modules/FindHDF5.cmake
deal.II/cmake/modules/FindMETIS.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/FindTBB.cmake
deal.II/cmake/modules/FindTRILINOS.cmake
deal.II/cmake/modules/FindUMFPACK.cmake

index 2ad1d6366fc9e7510f7e3275a24b9682cf39b186..a6e1419d6ad5612597afe55bac74dfb156c31ca2 100644 (file)
@@ -38,8 +38,8 @@ ENDMACRO()
 
 
 MACRO(FEATURE_METIS_CONFIGURE_EXTERNAL var)
-  INCLUDE_DIRECTORIES(${METIS_INCLUDE_DIR})
-  LIST(APPEND DEAL_II_EXTERNAL_LIBRARIES ${METIS_LIBRARY})
+  INCLUDE_DIRECTORIES(${METIS_INCLUDE_DIRS})
+  LIST(APPEND DEAL_II_EXTERNAL_LIBRARIES ${METIS_LIBRARIES})
 
   SET(DEAL_II_USE_METIS TRUE)
 
index d0806d8b4b164c53688c00fc596f36c2fed24b43..72cbde975b8ab769317fa5cf076e29ffd7551821 100644 (file)
 #   ARPACK_LINKER_FLAGS
 #
 
+#
+# TODO: ARPACK and mpi...
+#
+
 INCLUDE(FindPackageHandleStandardArgs)
 
 SET_IF_EMPTY(ARPACK_DIR "$ENV{ARPACK_DIR}")
 
 #
-# ARPACK needs LAPACK and BLAS as dependency, search for them with the help
-# of the LAPACK find module:
-#
-# TODO: ARPACK and mpi...
+# ARPACK needs LAPACK and BLAS as dependencies:
 #
 FIND_PACKAGE(LAPACK)
 
@@ -49,10 +50,7 @@ SET(ARPACK_LINKER_FLAGS
   ${LAPACK_LINKER_FLAGS}
   )
 
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(ARPACK DEFAULT_MSG
-  ARPACK_LIBRARY
-  LAPACK_FOUND
-  )
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(ARPACK DEFAULT_MSG ARPACK_LIBRARIES)
 
 IF(ARPACK_FOUND)
   MARK_AS_ADVANCED(
index d50babf090c45df2f1c7c60b8a929b635dfc53af..84626c11d7664bb4b0b82b62f0728d237999075f 100644 (file)
@@ -47,12 +47,6 @@ FIND_LIBRARY(HDF5_HL_LIBRARY NAMES hdf5_hl
     lib${LIB_SUFFIX} lib64 lib
   )
 
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(HDF5 DEFAULT_MSG
-  HDF5_LIBRARY
-  HDF5_HL_LIBRARY
-  HDF5_INCLUDE_DIR
-  )
-
 SET(HDF5_INCLUDE_DIRS
   ${HDF5_INCLUDE_DIR}
   )
@@ -62,14 +56,9 @@ SET(HDF5_LIBRARIES
   ${HDF5_HL_LIBRARY}
   )
 
-IF(HDF5_FOUND)
-  MARK_AS_ADVANCED(
-    HDF5_DIR
-    HDF5_LIBRARY
-    HDF5_HL_LIBRARY
-    HDF5_INCLUDE_DIR
-    )
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(HDF5 DEFAULT_MSG HDF5_LIBRARIES HDF5_INCLUDE_DIRS)
 
+IF(HDF5_FOUND)
   #
   # Is hdf5 compiled with support for mpi?
   #
@@ -81,6 +70,12 @@ IF(HDF5_FOUND)
     SET(HDF5_WITH_MPI TRUE)
   ENDIF()
 
+  MARK_AS_ADVANCED(
+    HDF5_DIR
+    HDF5_LIBRARY
+    HDF5_HL_LIBRARY
+    HDF5_INCLUDE_DIR
+    )
 ELSE()
   SET(HDF5_DIR "" CACHE STRING
     "An optional hint to an hdf5 directory"
index 48603bd9d8b005d3fd141f83b74088a26fe95e79..b27a85e998a79ca499ff704bf197e34725428968 100644 (file)
 #
 # Try to find the (serial) METIS library
 #
+# This module exports
+#
+#   METIS_LIBRARIES
+#   METIS_INCLUDE_DIRS
+#
 
 INCLUDE(FindPackageHandleStandardArgs)
 
@@ -42,7 +47,10 @@ FIND_LIBRARY(METIS_LIBRARY
     build/${CMAKE_CXX_PLATFORM_ID}-${CMAKE_SYSTEM_PROCESSOR}/libmetis
   )
 
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(METIS DEFAULT_MSG METIS_LIBRARY METIS_INCLUDE_DIR)
+SET(METIS_LIBRARIES ${METIS_LIBRARY})
+SET(METIS_INCLUDE_DIRS ${METIS_INCLUDE_DIRS})
+
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(METIS DEFAULT_MSG METIS_LIBRARIES METIS_INCLUDE_DIRS)
 
 IF(METIS_FOUND)
   #
index 6df5347d36943a5e32536bffc136f04407560c3d..4f8469a442bb96723561db0f34ea27575d4b5bfe 100644 (file)
@@ -85,11 +85,7 @@ SET(MUMPS_LINKER_FLAGS
   ${SCALAPACK_LINKER_FLAGS}
   )
 
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(MUMPS DEFAULT_MSG
-  DMUMPS_LIBRARY
-  MUMPS_COMMON_LIBRARY
-  SCALAPACK_FOUND
-  )
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(MUMPS DEFAULT_MSG MUMPS_LIBRARIES)
 
 IF(MUMPS_FOUND)
   MARK_AS_ADVANCED(
index ba930922a17df62ed6b38433f6bf57c653b0df5a..24f9d50ca8b88a507f2f9675260edbb56c220589 100644 (file)
@@ -59,8 +59,7 @@ SET(NETCDF_LIBRARIES
   )
 
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(NETCDF DEFAULT_MSG
-  NETCDF_CPLUSPLUS_LIBRARY
-  NETCDF_C_LIBRARY
+  NETCDF_LIBRARIES
   NETCDF_INCLUDE_DIRS
   )
 
index ffbcf2d3b1fa5ca29da9e65e7307f3a1b9ebd007..cb28bfaab0d4791ea40981627814e0d0b1e87bbc 100644 (file)
@@ -34,11 +34,9 @@ SET_IF_EMPTY(P4EST_DIR "$ENV{P4EST_DIR}")
 # to figure out how we can build deal.II against the two libraries
 # depending on whether we are in debug or optimized mode.
 #
-IF (P4EST_DIR
-    AND
-    EXISTS ${P4EST_DIR}/DEBUG
-    AND
-    EXISTS ${P4EST_DIR}/FAST)
+IF(P4EST_DIR
+   AND EXISTS ${P4EST_DIR}/DEBUG
+   AND EXISTS ${P4EST_DIR}/FAST)
   MESSAGE(STATUS "Found old-style p4est directory layout")
   SET (P4EST_DIR ${P4EST_DIR}/FAST)
 ENDIF()
@@ -78,9 +76,8 @@ SET(P4EST_INCLUDE_DIRS
   )
 
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(P4EST DEFAULT_MSG
-  P4EST_LIBRARY
-  P4EST_INCLUDE_DIR
-  SC_FOUND
+  P4EST_LIBRARIES
+  P4EST_INCLUDE_DIRS
   )
 
 IF(P4EST_FOUND)
index 2f17ae73a929c3dd8536d273517da00fd953f9ca..e70ca6721204daa32f2881a86bd2699951e14557 100644 (file)
@@ -73,10 +73,7 @@ FOREACH(_lib blacs blacsCinit blacsF77init)
 ENDFOREACH()
 
 
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(SCALAPACK DEFAULT_MSG
-  SCALAPACK_LIBRARY
-  LAPACK_FOUND
-  )
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(SCALAPACK DEFAULT_MSG SCALAPACK_LIBRARIES)
 
 IF(SCALAPACK_FOUND)
   MARK_AS_ADVANCED(
index e3f5afa2caf7cf14a7faefc2b2a5f332ef533995..17d9d1c8941229e5b288a475e91ecf4e03fa35dc 100644 (file)
@@ -15,6 +15,8 @@
 #
 # Try to find the Threading Building Blocks library
 #
+# TODO: Obey naming convention "LIBRARIES" and "INCLUDE_DIRS"
+#
 
 INCLUDE(FindPackageHandleStandardArgs)
 
index 3b44f196759395c8a825145ff7b1f93b02268c1d..4c39e0e12577de19397faba3e928f32448115350 100644 (file)
@@ -74,9 +74,8 @@ FOREACH(_library ${Trilinos_LIBRARIES})
 ENDFOREACH()
 
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(TRILINOS DEFAULT_MSG
-  TRILINOS_DIR
-  TRILINOS_INCLUDE_DIRS
   TRILINOS_LIBRARIES
+  TRILINOS_INCLUDE_DIRS
   )
 
 
index 58042d98ae66ee4abe0997cc1f469dd6055a5fd5..9a31efab344558d2a4aab6f454ee384b028f59ea 100644 (file)
@@ -32,13 +32,10 @@ ENDFOREACH()
 #
 # UMFPACK depends on BLAS and LAPACK, so search for them:
 # TODO: There might be an external dependency for metis, ignore this for
-#       now.
+# now.
 #
-
-FIND_PACKAGE(BLAS)
 FIND_PACKAGE(LAPACK)
 
-
 #
 # Two macros to make life easier:
 #
@@ -117,7 +114,6 @@ SET(UMFPACK_LIBRARIES
   ${AMD_LIBRARY}
   ${SuiteSparse_config_LIBRARY} # may be empty
   ${LAPACK_LIBRARIES}
-  ${BLAS_LIBRARIES}
   )
 
 SET(UMFPACK_INCLUDE_DIRS
@@ -127,7 +123,6 @@ SET(UMFPACK_INCLUDE_DIRS
   )
 
 SET(UMFPACK_LINKER_FLAGS
-  ${BLAS_LINKER_FLAGS}
   ${LAPACK_LINKER_FLAGS}
   )
 

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.