From d9514c4deaf1040071b4a1fece1a244b0eced42f Mon Sep 17 00:00:00 2001 From: maier Date: Mon, 24 Sep 2012 16:13:27 +0000 Subject: [PATCH] Update Make.global_options and unify PACKAGE_VERSION_MAJOR etc. git-svn-id: https://svn.dealii.org/branches/branch_cmake@26673 0785d39b-7218-0410-832d-ea1e28bc413d --- .../cmake/configure/configure_trilinos.cmake | 10 ++++----- deal.II/cmake/modules/FindPETSC.cmake | 2 ++ deal.II/cmake/modules/FindTRILINOS.cmake | 16 +++++++++++--- deal.II/config/CMakeLists.txt | 2 ++ deal.II/config/Make.global_options.in | 22 +++++++++---------- 5 files changed, 33 insertions(+), 19 deletions(-) diff --git a/deal.II/cmake/configure/configure_trilinos.cmake b/deal.II/cmake/configure/configure_trilinos.cmake index 1540c3c19b..cb92849238 100644 --- a/deal.II/cmake/configure/configure_trilinos.cmake +++ b/deal.II/cmake/configure/configure_trilinos.cmake @@ -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" diff --git a/deal.II/cmake/modules/FindPETSC.cmake b/deal.II/cmake/modules/FindPETSC.cmake index 3c05f4dfc8..1b82f4ac2e 100644 --- a/deal.II/cmake/modules/FindPETSC.cmake +++ b/deal.II/cmake/modules/FindPETSC.cmake @@ -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() diff --git a/deal.II/cmake/modules/FindTRILINOS.cmake b/deal.II/cmake/modules/FindTRILINOS.cmake index 325d6e1c5e..e0a3263940 100644 --- a/deal.II/cmake/modules/FindTRILINOS.cmake +++ b/deal.II/cmake/modules/FindTRILINOS.cmake @@ -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}) diff --git a/deal.II/config/CMakeLists.txt b/deal.II/config/CMakeLists.txt index 8936617167..58b638420a 100644 --- a/deal.II/config/CMakeLists.txt +++ b/deal.II/config/CMakeLists.txt @@ -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) diff --git a/deal.II/config/Make.global_options.in b/deal.II/config/Make.global_options.in index 1f3e760dc0..3bd7dfa503 100644 --- a/deal.II/config/Make.global_options.in +++ b/deal.II/config/Make.global_options.in @@ -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@ -- 2.39.5