]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Bugfix: Check also for fullfilled deps in Find...
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 28 Sep 2012 19:01:37 +0000 (19:01 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 28 Sep 2012 19:01:37 +0000 (19:01 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26861 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/cmake/modules/FindARPACK.cmake
deal.II/cmake/modules/FindP4EST.cmake
deal.II/cmake/modules/FindUMFPACK.cmake

index 171f4a180df28334384e968e42571506af082052..993c8d255f4e8ce160930883b58d68f17e3cb4f4 100644 (file)
@@ -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)
index 7582f365b09714bf5fdc39ce0cd70bca1116868f..8b68d802d5d6c03de40db973d10187dfc702d6f0 100644 (file)
@@ -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)
index 03e560b7fa66b5c0caea547fed43bc7e9f1db5a7..3ed76c69ef197d31fc38ce64bc86e3a603447e89 100644 (file)
@@ -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()

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.