← Back to branch summary

~ubuntu-branches/ubuntu/wily/dolfin/wily-proposed

« back to all changes in this revision

Viewing changes to cmake/modules/FindPETSc.cmake

  • Committer: Package Import Robot
  • Author(s): Johannes Ring
  • Date: 2015-03-17 07:57:11 UTC
  • mfrom: (1.1.18) (19.1.24 experimental)
  • Revision ID: package-import@ubuntu.com-20150317075711-1v207zbty9qmygow
Tags: 1.5.0-1
http://bugs.debian.org/780359
* New upstream release (closes: #780359).
* debian/control:
  - Bump Standards-Version to 3.9.6 (no changes needed).
  - Bump X-Python-Version to >= 2.7.
  - Update package names for new SONAME 1.5 (libdolfin1.4 ->
    libdolfin1.5, libdolfin1.4-dbg -> libdolfin1.5-dbg and
    libdolfin1.4-dev -> libdolfin1.5-dev).
  - Bump minimum required version for python-instant, python-ufl and
    python-ffc to 1.5.0.
  - Add python-sympy and python-six to Depends for binary package
    python-dolfin.
  - Add dh-python to Build-Depends.
  - Remove libcgal-dev from {Build-}Depends.
* Remove CSGCGALMeshGenerator3D-oom.patch since CGAL is no longer used
  by DOLFIN.
* Move debian/libdolfin1.4.install -> debian/libdolfin1.5.install.
* debian/rules: No longer any non DFSG-free stuff to remove, so update
  get-orig-source target (update debian/watch accordingly).
* Update debian/copyright and debian/copyright_hints.

Show diffs side-by-side

added added

removed removed

Lines of Context:
cmake/modules/FindPETSc.cmake
11
11
#  PETSC_VERSION_MAJOR - First number in PETSC_VERSION
12
12
#  PETSC_VERSION_MINOR - Second number in PETSC_VERSION
13
13
#  PETSC_VERSION_SUBMINOR - Third number in PETSC_VERSION
 
14
#  PETSC_INT_SIZE - sizeof(PetscInt)
14
15
#
15
16
# This config script is (very loosley) based on a PETSc CMake script by Jed Brown.
16
17
 
181
182
    endif()
182
183
 
183
184
    find_package(X11)
184
 
    list(APPEND PETSC_INCLUDE_DIRS ${X11_X11_INCLUDE_PATH})
185
 
    list(APPEND PETSC_EXTERNAL_LIBRARIES ${X11_LIBRARIES})
 
185
    if (X11_FOUND)
 
186
      list(APPEND PETSC_INCLUDE_DIRS ${X11_X11_INCLUDE_PATH})
 
187
      list(APPEND PETSC_EXTERNAL_LIBRARIES ${X11_LIBRARIES})
 
188
    endif()
186
189
 
187
190
    # ResolveCompilerPaths strips OSX frameworks, so add BLAS here for OSX
188
191
    petsc_get_variable(PETSC_BLASLAPACK_LIB BLASLAPACK_LIB)
355
358
 
356
359
endif()
357
360
 
 
361
# Check sizeof(PetscInt)
 
362
if (PETSC_INCLUDE_DIRS)
 
363
   include(CheckTypeSize)
 
364
   set(CMAKE_EXTRA_INCLUDE_FILES petsc.h)
 
365
   check_type_size("PetscInt" PETSC_INT_SIZE)
 
366
   set(CMAKE_EXTRA_INCLUDE_FILES)
 
367
endif()
 
368
 
358
369
# Standard package handling
359
370
include(FindPackageHandleStandardArgs)
360
371
find_package_handle_standard_args(PETSc