From e07d1edb62f864f2470f4937db9bc2a3b1b5be34 Mon Sep 17 00:00:00 2001 From: maier Date: Wed, 16 Jan 2013 17:51:03 +0000 Subject: [PATCH] A bunch of code cleanup git-svn-id: https://svn.dealii.org/branches/branch_cmake@28080 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/cmake/configure/configure_metis.cmake | 4 ++-- deal.II/cmake/modules/FindARPACK.cmake | 14 ++++++------- deal.II/cmake/modules/FindHDF5.cmake | 21 +++++++------------ deal.II/cmake/modules/FindMETIS.cmake | 10 ++++++++- deal.II/cmake/modules/FindMUMPS.cmake | 6 +----- deal.II/cmake/modules/FindNETCDF.cmake | 3 +-- deal.II/cmake/modules/FindP4EST.cmake | 13 +++++------- deal.II/cmake/modules/FindSCALAPACK.cmake | 5 +---- deal.II/cmake/modules/FindTBB.cmake | 2 ++ deal.II/cmake/modules/FindTRILINOS.cmake | 3 +-- deal.II/cmake/modules/FindUMFPACK.cmake | 7 +------ 11 files changed, 37 insertions(+), 51 deletions(-) diff --git a/deal.II/cmake/configure/configure_metis.cmake b/deal.II/cmake/configure/configure_metis.cmake index 2ad1d6366f..a6e1419d6a 100644 --- a/deal.II/cmake/configure/configure_metis.cmake +++ b/deal.II/cmake/configure/configure_metis.cmake @@ -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) diff --git a/deal.II/cmake/modules/FindARPACK.cmake b/deal.II/cmake/modules/FindARPACK.cmake index d0806d8b4b..72cbde975b 100644 --- a/deal.II/cmake/modules/FindARPACK.cmake +++ b/deal.II/cmake/modules/FindARPACK.cmake @@ -21,15 +21,16 @@ # 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( diff --git a/deal.II/cmake/modules/FindHDF5.cmake b/deal.II/cmake/modules/FindHDF5.cmake index d50babf090..84626c11d7 100644 --- a/deal.II/cmake/modules/FindHDF5.cmake +++ b/deal.II/cmake/modules/FindHDF5.cmake @@ -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" diff --git a/deal.II/cmake/modules/FindMETIS.cmake b/deal.II/cmake/modules/FindMETIS.cmake index 48603bd9d8..b27a85e998 100644 --- a/deal.II/cmake/modules/FindMETIS.cmake +++ b/deal.II/cmake/modules/FindMETIS.cmake @@ -15,6 +15,11 @@ # # 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) # diff --git a/deal.II/cmake/modules/FindMUMPS.cmake b/deal.II/cmake/modules/FindMUMPS.cmake index 6df5347d36..4f8469a442 100644 --- a/deal.II/cmake/modules/FindMUMPS.cmake +++ b/deal.II/cmake/modules/FindMUMPS.cmake @@ -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( diff --git a/deal.II/cmake/modules/FindNETCDF.cmake b/deal.II/cmake/modules/FindNETCDF.cmake index ba930922a1..24f9d50ca8 100644 --- a/deal.II/cmake/modules/FindNETCDF.cmake +++ b/deal.II/cmake/modules/FindNETCDF.cmake @@ -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 ) diff --git a/deal.II/cmake/modules/FindP4EST.cmake b/deal.II/cmake/modules/FindP4EST.cmake index ffbcf2d3b1..cb28bfaab0 100644 --- a/deal.II/cmake/modules/FindP4EST.cmake +++ b/deal.II/cmake/modules/FindP4EST.cmake @@ -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) diff --git a/deal.II/cmake/modules/FindSCALAPACK.cmake b/deal.II/cmake/modules/FindSCALAPACK.cmake index 2f17ae73a9..e70ca67212 100644 --- a/deal.II/cmake/modules/FindSCALAPACK.cmake +++ b/deal.II/cmake/modules/FindSCALAPACK.cmake @@ -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( diff --git a/deal.II/cmake/modules/FindTBB.cmake b/deal.II/cmake/modules/FindTBB.cmake index e3f5afa2ca..17d9d1c894 100644 --- a/deal.II/cmake/modules/FindTBB.cmake +++ b/deal.II/cmake/modules/FindTBB.cmake @@ -15,6 +15,8 @@ # # Try to find the Threading Building Blocks library # +# TODO: Obey naming convention "LIBRARIES" and "INCLUDE_DIRS" +# INCLUDE(FindPackageHandleStandardArgs) diff --git a/deal.II/cmake/modules/FindTRILINOS.cmake b/deal.II/cmake/modules/FindTRILINOS.cmake index 3b44f19675..4c39e0e125 100644 --- a/deal.II/cmake/modules/FindTRILINOS.cmake +++ b/deal.II/cmake/modules/FindTRILINOS.cmake @@ -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 ) diff --git a/deal.II/cmake/modules/FindUMFPACK.cmake b/deal.II/cmake/modules/FindUMFPACK.cmake index 58042d98ae..9a31efab34 100644 --- a/deal.II/cmake/modules/FindUMFPACK.cmake +++ b/deal.II/cmake/modules/FindUMFPACK.cmake @@ -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} ) -- 2.39.5