Merge branch 'fix/petsc_python2' into 'master'

fix PETSc build on operating systems where python defaults to python3



See merge request !646

CHANGELOG.md

@@ -39,6 +39,7 @@ v4.3.3
 
 **Packaging**:
 - Fix NekMesh dependencies for DEB package (!650)
+- Fix PETSc build on newer linux distributions (!646)
 
 v4.3.2
 ------

cmake/ThirdPartyPETSc.cmake

@@ -26,6 +26,8 @@ IF (NEKTAR_USE_PETSC)
     IF (THIRDPARTY_BUILD_PETSC)
         INCLUDE(ExternalProject)
 
+        FIND_PACKAGE(PythonInterp 2 REQUIRED)
+
         SET(PETSC_C_COMPILER   "${CMAKE_C_COMPILER}")
         SET(PETSC_CXX_COMPILER "${CMAKE_CXX_COMPILER}")
 
@@ -39,24 +41,23 @@ IF (NEKTAR_USE_PETSC)
         ENDIF (NEKTAR_USE_MPI)
 
         EXTERNALPROJECT_ADD(
-            petsc-3.5.2
+            petsc-3.7.2
             PREFIX ${TPSRC}
             STAMP_DIR ${TPBUILD}/stamp
             DOWNLOAD_DIR ${TPSRC}
-            SOURCE_DIR ${TPBUILD}/petsc-3.5.2
-            TMP_DIR ${TPBUILD}/petsc-3.5.2-tmp
+            SOURCE_DIR ${TPBUILD}/petsc-3.7.2
+            TMP_DIR ${TPBUILD}/petsc-3.7.2-tmp
             INSTALL_DIR ${TPDIST}
-            BINARY_DIR ${TPBUILD}/petsc-3.5.2
-            URL http://www.nektar.info/thirdparty/petsc-lite-3.5.2.tar.gz
-            URL_MD5 "d707336a98d7cb31d843804d020edc94"
+            BINARY_DIR ${TPBUILD}/petsc-3.7.2
+            URL http://www.nektar.info/thirdparty/petsc-lite-3.7.2.tar.gz
+            URL_MD5 "26c2ff8eaaa9e49aea063f839f5daa7e"
             CONFIGURE_COMMAND
                 OMPI_CC=${CMAKE_C_COMPILER}
                 OMPI_CXX=${CMAKE_CXX_COMPILER}
-                ./configure
+                ${PYTHON_EXECUTABLE} ./configure
                 --with-cc=${PETSC_C_COMPILER}
                 --with-cxx=${PETSC_CXX_COMPILER}
-                --with-shared-libraries=0
-                --with-pic=1
+                --with-shared-libraries=1
                 --with-x=0
                 --with-ssl=0
                 --prefix=${TPDIST}
@@ -71,7 +72,7 @@ IF (NEKTAR_USE_PETSC)
             "PETSc includes" FORCE)
 
         LINK_DIRECTORIES(${TPDIST}/lib)
-        MESSAGE(STATUS "Build PETSc: ${TPDIST}/${LIB_DIR}/lib${PETSC_LIBRARIES}.a")
+        MESSAGE(STATUS "Build PETSc: ${TPDIST}/${LIB_DIR}/lib${PETSC_LIBRARIES}.so")
         SET(PETSC_CONFIG_INCLUDE_DIR ${TPINC})
     ELSE (THIRDPARTY_BUILD_PETSC)
         INCLUDE(FindPETSc)
@@ -82,13 +83,13 @@ IF (NEKTAR_USE_PETSC)
         ENDIF (NOT PETSC_FOUND)
         SET(PETSC_CONFIG_INCLUDE_DIR ${PETSC_INCLUDES})
         INCLUDE_DIRECTORIES(${PETSC_INCLUDES})
-        ADD_CUSTOM_TARGET(petsc-3.5.2 ALL)
+        ADD_CUSTOM_TARGET(petsc-3.7.2 ALL)
     ENDIF (THIRDPARTY_BUILD_PETSC)
 
     ADD_DEFINITIONS(-DNEKTAR_USING_PETSC)
     INCLUDE_DIRECTORIES(SYSTEM ${PETSC_INCLUDES})
     IF (NOT NEKTAR_USE_MPI)
-        INCLUDE_DIRECTORIES(SYSTEM ${PETSC_INCLUDES}/mpiuni)
+        INCLUDE_DIRECTORIES(SYSTEM ${PETSC_INCLUDES}/petsc/mpiuni)
     ENDIF (NOT NEKTAR_USE_MPI)
 
     MARK_AS_ADVANCED(PETSC_CURRENT PETSC_DIR PETSC_LIBRARIES PETSC_INCLUDES)

library/LibUtilities/CMakeLists.txt

@@ -461,7 +461,7 @@ ENDIF( NEKTAR_USE_BLAS_LAPACK )
 IF( NEKTAR_USE_PETSC )
     TARGET_LINK_LIBRARIES(LibUtilities LINK_PRIVATE ${PETSC_LIBRARIES})
     TARGET_LINK_LIBRARIES(LibUtilities LINK_PUBLIC ${CMAKE_DL_LIBS})
-    ADD_DEPENDENCIES(LibUtilities petsc-3.5.2)
+    ADD_DEPENDENCIES(LibUtilities petsc-3.7.2)
 ENDIF( NEKTAR_USE_PETSC )
 
 INSTALL(FILES ${ExpressionTemplates} DESTINATION ${NEKTAR_INCLUDE_DIR}/ExpressionTemplates COMPONENT dev)

library/MultiRegions/CMakeLists.txt

@@ -144,7 +144,7 @@ ENDIF( NEKTAR_USE_MPI )
 
 IF( NEKTAR_USE_PETSC )
     TARGET_LINK_LIBRARIES(MultiRegions LINK_PRIVATE ${PETSC_LIBRARIES})
-    ADD_DEPENDENCIES(MultiRegions petsc-3.5.2)
+    ADD_DEPENDENCIES(MultiRegions petsc-3.7.2)
 ENDIF( NEKTAR_USE_PETSC )
 
 INSTALL(DIRECTORY ./ DESTINATION ${NEKTAR_INCLUDE_DIR}/MultiRegions COMPONENT dev FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp")