From: maier Date: Tue, 12 Mar 2013 12:26:56 +0000 (+0000) Subject: CMake: Bugfix, use a separate variable for FIND_PACKAGE, improve search order X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eaa6bd00e49e6344db037da05c4a6ee7ca0e1023;p=dealii-svn.git CMake: Bugfix, use a separate variable for FIND_PACKAGE, improve search order git-svn-id: https://svn.dealii.org/trunk@28865 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/cmake/modules/FindTRILINOS.cmake b/deal.II/cmake/modules/FindTRILINOS.cmake index bb37a6b1db..757a31c3ce 100644 --- a/deal.II/cmake/modules/FindTRILINOS.cmake +++ b/deal.II/cmake/modules/FindTRILINOS.cmake @@ -33,17 +33,18 @@ SET_IF_EMPTY(TRILINOS_DIR "$ENV{TRILINOS_DIR}") # # Include the trilinos package configuration: # -FIND_PACKAGE(TRILINOS - QUIET CONFIG +FIND_PACKAGE(TRILINOS_CONFIG + CONFIG NAMES Trilinos TRILINOS HINTS + ${TRILINOS_DIR}/lib/cmake/Trilinos ${TRILINOS_DIR} PATH_SUFFIXES - lib${LIB_SUFFIX}/cmake/Trilinos lib64/cmake/Trilinos lib/cmake/Trilinos - include/Trilinos + lib${LIB_SUFFIX}/cmake/Trilinos include/trilinos + include/Trilinos NO_SYSTEM_ENVIRONMENT_PATH ) @@ -77,7 +78,7 @@ ENDFOREACH() FIND_PACKAGE_HANDLE_STANDARD_ARGS(TRILINOS DEFAULT_MSG TRILINOS_LIBRARIES # cosmetic: Gives nice output - TRILINOS_FOUND + TRILINOS_CONFIG_FOUND )