Merge branch 'jose/release/order-of-includes' into 'release'

makefile: place SLEPc includes before PETSc includes See merge request slepc/slepc!523
firedrakeproject · Apr 2, 2023 · 4aa7bc1 · 4aa7bc1
2 parents 3b7d6b3 + 943701b
commit 4aa7bc1
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/lib/slepc/conf/slepc_variables b/lib/slepc/conf/slepc_variables
@@ -28,10 +28,10 @@ SLEPC_F_SH_LIB_PATH = ${FC_LINKER_SLFLAG}${SLEPC_LIB_DIR}
 
 # Redefine variables in PETSc makefiles
 INSTALL_LIB_DIR = ${SLEPC_LIB_DIR}
-CCPPFLAGS       = ${PETSC_CCPPFLAGS} ${SLEPC_CCPPFLAGS}
-CXXCPPFLAGS     = ${PETSC_CXXCPPFLAGS} ${SLEPC_CXXCPPFLAGS}
-FCPPFLAGS       = ${PETSC_FCPPFLAGS} ${SLEPC_FCPPFLAGS}
-CUDACPPFLAGS    = ${PETSC_CUDACPPFLAGS} ${SLEPC_CUDACPPFLAGS}
+CCPPFLAGS       = ${SLEPC_CCPPFLAGS} ${PETSC_CCPPFLAGS}
+CXXCPPFLAGS     = ${SLEPC_CXXCPPFLAGS} ${PETSC_CXXCPPFLAGS}
+FCPPFLAGS       = ${SLEPC_FCPPFLAGS} ${PETSC_FCPPFLAGS}
+CUDACPPFLAGS    = ${SLEPC_CUDACPPFLAGS} ${PETSC_CUDACPPFLAGS}
 
 # Variables for the different SLEPc modules
 SLEPC_SYS_LIB_BASIC = -lslepcsys