]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Update Make.global_options and unify PACKAGE_VERSION_MAJOR etc.
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 24 Sep 2012 16:13:27 +0000 (16:13 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 24 Sep 2012 16:13:27 +0000 (16:13 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26673 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/cmake/configure/configure_trilinos.cmake
deal.II/cmake/modules/FindPETSC.cmake
deal.II/cmake/modules/FindTRILINOS.cmake
deal.II/config/CMakeLists.txt
deal.II/config/Make.global_options.in

index 1540c3c19be7badae7c760f7dcfdfc592def4434..cb92849238440b7ef7dd49b1e50e294d248ed12e 100644 (file)
@@ -53,9 +53,9 @@ MACRO(FEATURE_TRILINOS_FIND_EXTERNAL var)
     #   https://software.sandia.gov/bugzilla/show_bug.cgi?id=5062
     #   https://software.sandia.gov/bugzilla/show_bug.cgi?id=5319
     #
-    IF(TRILINOS_MAJOR EQUAL 10 AND TRILINOS_MINOR EQUAL 6)
+    IF(TRILINOS_VERSION_MAJOR EQUAL 10 AND TRILINOS_VERSION_MINOR EQUAL 6)
       MESSAGE(WARNING "\n"
-        "Trilinos versions ${TRILINOS_MAJOR}.${TRILINOS_MINOR}.x have bugs that make\n"
+        "Trilinos versions ${TRILINOS_VERSION_MAJOR}.${TRILINOS_VERSION_MINOR}.x have bugs that make\n"
         "it incompatible with deal.II. Please use versions before 10.6 or after\n"
         "10.8.1.\n\n"
         )
@@ -67,9 +67,9 @@ MACRO(FEATURE_TRILINOS_FIND_EXTERNAL var)
     # The same is unfortunately true for 10.8.[01]:
     #   https://software.sandia.gov/bugzilla/show_bug.cgi?id=5370
     #
-    IF( TRILINOS_MAJOR EQUAL 10 AND
-        TRILINOS_MINOR EQUAL 8 AND
-        TRILINOS_SUBMINOR LESS 2 )
+    IF( TRILINOS_VERSION_MAJOR EQUAL 10 AND
+        TRILINOS_VERSION_MINOR EQUAL 8 AND
+        TRILINOS_VERSION_SUBMINOR LESS 2 )
       MESSAGE(WARNING "\n"
         "Trilinos versions 10.8.0 and 10.8.1 have bugs that make\n"
         "it incompatible with deal.II. Please use versions before 10.6 or after\n"
index 3c05f4dfc81f89d69b3e3898f0a0c32ecb196a35..1b82f4ac2ee28b02b18e694110a51eca8aec6177 100644 (file)
@@ -111,6 +111,8 @@ IF(NOT PETSC_PETSCCONF_H MATCHES "-NOTFOUND")
       )
     IF(NOT PETSC_LIBMPIUNI MATCHES "-NOTFOUND")
       LIST(APPEND PETSC_LIBRARIES "${PETSC_LIBMPIUNI}")
+    ELSE()
+      SET(PETSC_LIBMPIUNI "")
     ENDIF()
     MARK_AS_ADVANCED(PETSC_LIBMPIUNI)
   ENDIF()
index 325d6e1c5ed8e88248eed271d5b76605bbec0e06..e0a32639401221abbed31845aa374296195415f4 100644 (file)
@@ -1,6 +1,16 @@
 #
 # Try to find the Trilinos library
 #
+# This module exports:
+#
+#   TRILINOS_DIR
+#   TRILINOS_INCLUDE_DIRS
+#   TRILINOS_LIBRARY_*
+#   TRILINOS_LIBRARIES
+#   TRILINOS_VERSION_MAJOR
+#   TRILINOS_VERSION_MINOR
+#   TRILINOS_VERSION_SUBMINOR
+#
 
 INCLUDE(FindPackageHandleStandardArgs)
 
@@ -24,15 +34,15 @@ find_package(TRILINOS
 #
 STRING(REGEX REPLACE
   "^([0-9]+).*$" "\\1"
-  TRILINOS_MAJOR "${Trilinos_VERSION}")
+  TRILINOS_VERSION_MAJOR "${Trilinos_VERSION}")
 
 STRING(REGEX REPLACE
   "^[0-9]+\\.([0-9]+).*$" "\\1"
-  TRILINOS_MINOR "${Trilinos_VERSION}")
+  TRILINOS_VERSION_MINOR "${Trilinos_VERSION}")
 
 STRING(REGEX REPLACE
   "^[0-9]+\\.[0-9]+\\.([0-9]+).*$" "\\1"
-  TRILINOS_SUBMINOR "${Trilinos_VERSION}")
+  TRILINOS_VERSION_SUBMINOR "${Trilinos_VERSION}")
 
 
 SET(TRILINOS_INCLUDE_DIRS ${Trilinos_INCLUDE_DIRS})
index 89366171670ed7d281ef67675ef26bbf70bb67b6..58b638420a19ab35160995c03be13d17cc525cc9 100644 (file)
@@ -86,6 +86,8 @@ IF(DEAL_II_COMPONENT_COMPAT_FILES)
   COND_SET_TO_YES(DEAL_II_WITH_FUNCTIONPARSER MAKEFILE_enableparser)
   COND_SET_TO_YES(BUILD_SHARED_LIBS MAKEFILE_enableshared)
 
+  COND_SET_TO_YES(DEAL_II_WITH_PETSC MAKEFILE_PETSC)
+  COND_SET_TO_YES(DEAL_II_USE_PETSC_DEV MAKEFILE_PETSC_DEV)
   COND_SET_TO_YES(DEAL_II_WITH_TRILINOS MAKEFILE_TRILINOS)
   COND_SET_TO_YES(DEAL_II_WITH_BLAS MAKEFILE_BLAS)
   COND_SET_TO_YES(DEAL_II_WITH_LAPACK MAKEFILE_LAPACK)
index 1f3e760dc040c69b32f4459afd46c280ae0a9bf1..3bd7dfa503eed4333c81cfe1e9adcc2a8f0c3848 100644 (file)
@@ -72,14 +72,14 @@ DEAL_II_MINOR        = @DEAL_II_MINOR@
 # TODO: Reenable or remove
 #
 
-#USE_CONTRIB_PETSC    = @USE_CONTRIB_PETSC@
-#DEAL_II_PETSC_DIR    = @DEAL_II_PETSC_DIR@
-#DEAL_II_PETSC_ARCH   = @DEAL_II_PETSC_ARCH@
-#DEAL_II_PETSC_VERSION_MAJOR    = @DEAL_II_PETSC_VERSION_MAJOR@
-#DEAL_II_PETSC_VERSION_MINOR    = @DEAL_II_PETSC_VERSION_MINOR@
-#DEAL_II_PETSC_VERSION_SUBMINOR = @DEAL_II_PETSC_VERSION_SUBMINOR@
-#DEAL_II_PETSC_VERSION_DEV      = @DEAL_II_PETSC_VERSION_DEV@
-#DEAL_II_PETSC_MPIUNI_LIB       = @DEAL_II_PETSC_MPIUNI_LIB@
+USE_CONTRIB_PETSC    = @MAKEFILE_PETSC@
+DEAL_II_PETSC_DIR    = @PETSC_DIR@ # TODO: Fix this!
+DEAL_II_PETSC_ARCH   = @PETSC_ARCH@
+DEAL_II_PETSC_VERSION_MAJOR    = @PETSC_VERSION_MAJOR@
+DEAL_II_PETSC_VERSION_MINOR    = @PETSC_VERSION_MINOR@
+DEAL_II_PETSC_VERSION_SUBMINOR = @PETSC_VERSION_SUBMINOR@
+DEAL_II_PETSC_VERSION_DEV      = @MAKEFILE_PETSC_DEV@
+DEAL_II_PETSC_MPIUNI_LIB       = @PETSC_LIBMPIUNI@
 
 #USE_CONTRIB_SLEPC    = @USE_CONTRIB_SLEPC@
 #DEAL_II_SLEPC_DIR    = @DEAL_II_SLEPC_DIR@
@@ -92,9 +92,9 @@ DEAL_II_TRILINOS_INCDIR = @TRILINOS_INCLUDE_DIRS@ # TODO: This will fail if ther
 #DEAL_II_TRILINOS_LIBDIR = @DEAL_II_TRILINOS_LIBDIR@ # TODO
 #DEAL_II_TRILINOS_SHARED = @DEAL_II_TRILINOS_SHARED@ # TODO
 #DEAL_II_TRILINOS_STATIC = @DEAL_II_TRILINOS_STATIC@ # TODO
-DEAL_II_TRILINOS_VERSION_MAJOR    = @TRILINOS_MAJOR@
-DEAL_II_TRILINOS_VERSION_MINOR    = @TRILINOS_MINOR@
-DEAL_II_TRILINOS_VERSION_SUBMINOR = @TRILINOS_SUBMINOR@
+DEAL_II_TRILINOS_VERSION_MAJOR    = @TRILINOS_VERSION_MAJOR@
+DEAL_II_TRILINOS_VERSION_MINOR    = @TRILINOS_VERSION_MINOR@
+DEAL_II_TRILINOS_VERSION_SUBMINOR = @TRILINOS_VERSION_SUBMINOR@
 #DEAL_II_TRILINOS_LIBPREFIX = @DEAL_II_TRILINOS_LIBPREFIX@ # TODO
 
 #USE_CONTRIB_HDF5 = @USE_CONTRIB_HDF5@

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.