FindPETSc: handle petsc-3.6 layout $prefix/lib/petsc-conf/

Reported-by: Pierre Jolivet <[email protected]>
jedbrown · Feb 6, 2015 · 732ce5f · 732ce5f
1 parent de0ad59
commit 732ce5f
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/FindPETSc.cmake b/FindPETSc.cmake
@@ -112,7 +112,10 @@ find_package_multipass (PETSc petsc_config_current
 
 # Determine whether the PETSc layout is old-style (through 2.3.3) or
 # new-style (>= 3.0.0)
-if (EXISTS "${PETSC_DIR}/${PETSC_ARCH}/include/petscconf.h")   # > 2.3.3
+if (EXISTS "${PETSC_DIR}/${PETSC_ARCH}/lib/petsc-conf/petscvariables") # > 3.5
+  set (petsc_conf_rules "${PETSC_DIR}/lib/petsc-conf/rules")
+  set (petsc_conf_variables "${PETSC_DIR}/lib/petsc-conf/variables")
+elseif (EXISTS "${PETSC_DIR}/${PETSC_ARCH}/include/petscconf.h")   # > 2.3.3
   set (petsc_conf_rules "${PETSC_DIR}/conf/rules")
   set (petsc_conf_variables "${PETSC_DIR}/conf/variables")
 elseif (EXISTS "${PETSC_DIR}/bmake/${PETSC_ARCH}/petscconf.h") # <= 2.3.3