From: maier Date: Fri, 28 Sep 2012 19:01:37 +0000 (+0000) Subject: Bugfix: Check also for fullfilled deps in Find... X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1024f57508a18e96d354a9915ee7fe1c5b06dc6;p=dealii-svn.git Bugfix: Check also for fullfilled deps in Find... git-svn-id: https://svn.dealii.org/branches/branch_cmake@26861 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/cmake/modules/FindARPACK.cmake b/deal.II/cmake/modules/FindARPACK.cmake index 171f4a180d..993c8d255f 100644 --- a/deal.II/cmake/modules/FindARPACK.cmake +++ b/deal.II/cmake/modules/FindARPACK.cmake @@ -30,7 +30,8 @@ SET(ARPACK_LINKER_FLAGS ) FIND_PACKAGE_HANDLE_STANDARD_ARGS(ARPACK DEFAULT_MSG - ARPACK_LIBRARIES + ARPACK_LIBRARY + LAPACK_FOUND ) IF(ARPACK_FOUND) diff --git a/deal.II/cmake/modules/FindP4EST.cmake b/deal.II/cmake/modules/FindP4EST.cmake index 7582f365b0..8b68d802d5 100644 --- a/deal.II/cmake/modules/FindP4EST.cmake +++ b/deal.II/cmake/modules/FindP4EST.cmake @@ -42,8 +42,9 @@ SET(P4EST_INCLUDE_DIRS ) FIND_PACKAGE_HANDLE_STANDARD_ARGS(P4EST DEFAULT_MSG - P4EST_LIBRARIES - P4EST_INCLUDE_DIRS + SC_FOUND + P4EST_LIBRARY + P4EST_INCLUDE_DIR ) IF(P4EST_FOUND) diff --git a/deal.II/cmake/modules/FindUMFPACK.cmake b/deal.II/cmake/modules/FindUMFPACK.cmake index 03e560b7fa..3ed76c69ef 100644 --- a/deal.II/cmake/modules/FindUMFPACK.cmake +++ b/deal.II/cmake/modules/FindUMFPACK.cmake @@ -33,10 +33,10 @@ FIND_LIBRARY(UMFPACK_LIBRARY lib${LIB_SUFFIX} lib64 lib Lib UMFPACK/Lib ../UMFPACK/Lib ) + SET(required_variables - blas_LIBRARY - AMD_INCLUDE_DIR - AMD_LIBRARY + BLAS_FOUND + AMD_FOUND UMFPACK_INCLUDE_DIRS UMFPACK_LIBRARY ) @@ -51,8 +51,7 @@ IF(NOT UMFPACK_INCLUDE_DIR MATCHES "-NOTFOUND") IF(NOT "${UMFPACK_SUITESPARSE_STRING}" STREQUAL "") FIND_PACKAGE(SUITESPARSECONFIG) LIST(APPEND required_variables - SUITESPARSECONFIG_LIBRARY - SUITESPARSECONFIG_INCLUDE_DIR + SUITESPARSECONFIG_FOUND ) ENDIF() ENDIF()