CMake: Stylistic fixes

diff --git a/cmake/modules/FindSUNDIALS.cmake b/cmake/modules/FindSUNDIALS.cmake
index 731d93aec716139e4742f596b3dd286eceb971f3..e60d88dc675824c8253da6c28ec9958e740a21b1 100644 (file)
--- a/cmake/modules/FindSUNDIALS.cmake
+++ b/cmake/modules/FindSUNDIALS.cmake
@@ -27,61 +27,37 @@ SET_IF_EMPTY(SUNDIALS_DIR "$ENV{SUNDIALS_DIR}")
 
 DEAL_II_FIND_LIBRARY(SUNDIALS_LIB_IDA NAMES sundials_ida
   HINTS ${SUNDIALS_DIR}
-  PATH_SUFFIXES lib
+  PATH_SUFFIXES lib${LIB_SUFFIX} lib64 lib
   )
 
 DEAL_II_FIND_LIBRARY(SUNDIALS_LIB_KINSOL NAMES sundials_kinsol
   HINTS ${SUNDIALS_DIR}
-  PATH_SUFFIXES lib
+  PATH_SUFFIXES lib${LIB_SUFFIX} lib64 lib
   )
 
 DEAL_II_FIND_LIBRARY(SUNDIALS_LIB_SER NAMES sundials_nvecserial
   HINTS ${SUNDIALS_DIR}
-  PATH_SUFFIXES lib
+  PATH_SUFFIXES lib${LIB_SUFFIX} lib64 lib
   )
 
 SET(SUN_INC "${SUNDIALS_DIR}/include")
 
+SET(_sundials_additional_libs)
 IF(DEAL_II_WITH_MPI)
   DEAL_II_FIND_LIBRARY(SUNDIALS_LIB_PAR NAMES sundials_nvecparallel
     HINTS ${SUNDIALS_DIR}
-    PATH_SUFFIXES lib
+    PATH_SUFFIXES lib${LIB_SUFFIX} lib64 lib
     )
+  SET(_sundials_additional_libs SUNDIALS_LIB_PAR)
+ENDIF()
 
-  DEAL_II_PACKAGE_HANDLE(SUNDIALS
-    LIBRARIES REQUIRED
-    SUNDIALS_LIB_IDA
-    SUNDIALS_LIB_KINSOL
-    SUNDIALS_LIB_SER
-    SUNDIALS_LIB_PAR
-    INCLUDE_DIRS
-    REQUIRED SUN_INC
-    USER_INCLUDE_DIRS
-    REQUIRED SUN_INC
-    CLEAR
-    SUNDIALS_LIB_IDA
-    SUNDIALS_LIB_KINSOL
-    SUNDIALS_LIB_SER
-    SUNDIALS_LIB_PAR
-    SUN_INC
-    )
-
-ELSE()
-
-  DEAL_II_PACKAGE_HANDLE(SUNDIALS
-    LIBRARIES REQUIRED
-    SUNDIALS_LIB_IDA
-    SUNDIALS_LIB_KINSOL
-    SUNDIALS_LIB_SER
-    INCLUDE_DIRS
-    REQUIRED SUN_INC
-    USER_INCLUDE_DIRS
-    REQUIRED SUN_INC
-    CLEAR
-    SUNDIALS_LIB_IDA
-    SUNDIALS_LIB_KINSOL
-    SUNDIALS_LIB_SER
+DEAL_II_PACKAGE_HANDLE(SUNDIALS
+  LIBRARIES REQUIRED
+    SUNDIALS_LIB_IDA SUNDIALS_LIB_KINSOL SUNDIALS_LIB_SER SUNDIALS_LIB_PAR
+    ${_sundials_additional_libs}
+  INCLUDE_DIRS REQUIRED SUN_INC
+  USER_INCLUDE_DIRS REQUIRED SUN_INC
+  CLEAR
+    SUNDIALS_LIB_IDA SUNDIALS_LIB_KINSOL SUNDIALS_LIB_SER SUNDIALS_LIB_PAR
     SUN_INC
-    )
-
-ENDIF()
+  )