From: maier Date: Thu, 27 Sep 2012 12:49:51 +0000 (+0000) Subject: Add a 'bugfix' X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea1638292a034f78a227a305b312414b3ab292b7;p=dealii-svn.git Add a 'bugfix' git-svn-id: https://svn.dealii.org/branches/branch_cmake@26782 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/cmake/modules/FindPETSC.cmake b/deal.II/cmake/modules/FindPETSC.cmake index 3ba5f89059..05d5a37da2 100644 --- a/deal.II/cmake/modules/FindPETSC.cmake +++ b/deal.II/cmake/modules/FindPETSC.cmake @@ -20,6 +20,25 @@ INCLUDE(FindPackageHandleStandardArgs) SET_IF_EMPTY(PETSC_DIR "$ENV{PETSC_DIR}") SET_IF_EMPTY(PETSC_ARCH "$ENV{PETSC_ARCH}") +# +# So, well, yes. I'd like to include the PETScConfig.cmake file via +# FIND_PACKAGE(), but it is broken beyond belief: +# +# - In source, i.e. PETSC_DIR/PETSC_ARCH, it sets BUILD_SHARED_LIBS. +# - It does not contain its very own version number +# - It does not contain its very own library location(s) or name(s) +# - It does not contain necessary includes +# +# - It writes a lot of FIND_LIBRARY(..) statements. Seriously. What the +# heck? If its not the same library you're linking against, you cannot +# assume to be API compatible, so why not just give a list of libraries? +# + +# +# TODO: We'll have to guess which external libraries we'll have to link +# against someday... +# + # # Search for the first part of the includes: # @@ -31,7 +50,6 @@ FIND_PATH(PETSC_INCLUDE_DIR_ARCH petscconf.h PATH_SUFFIXES petsc ) - FIND_LIBRARY(PETSC_LIBRARIES NAMES petsc HINTS diff --git a/deal.II/cmake/modules/FindTRILINOS.cmake b/deal.II/cmake/modules/FindTRILINOS.cmake index d2024987cf..a004fac8cb 100644 --- a/deal.II/cmake/modules/FindTRILINOS.cmake +++ b/deal.II/cmake/modules/FindTRILINOS.cmake @@ -19,7 +19,7 @@ SET_IF_EMPTY(TRILINOS_DIR "$ENV{TRILINOS_DIR}") # # Include the trilinos package configuration: # -find_package(TRILINOS +FIND_PACKAGE(TRILINOS QUIET CONFIG NAMES Trilinos TRILINOS HINTS