[cig-commits] r22934 - in seismo/3D/SPECFEM3D/trunk/src: generate_databases meshfem3D specfem3D
elliott.sales.de.andrade at geodynamics.org
elliott.sales.de.andrade at geodynamics.org
Mon Oct 7 17:02:42 PDT 2013
Author: elliott.sales.de.andrade
Date: 2013-10-07 17:02:41 -0700 (Mon, 07 Oct 2013)
New Revision: 22934
Modified:
seismo/3D/SPECFEM3D/trunk/src/generate_databases/Makefile.in
seismo/3D/SPECFEM3D/trunk/src/meshfem3D/Makefile.in
seismo/3D/SPECFEM3D/trunk/src/specfem3D/Makefile.in
Log:
build: Remove setup directory from ADIOS includes.
This directory doesn't exist in SPECFEM3D. It causes warnings with
gfortran.
Modified: seismo/3D/SPECFEM3D/trunk/src/generate_databases/Makefile.in
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/generate_databases/Makefile.in 2013-10-08 00:00:15 UTC (rev 22933)
+++ seismo/3D/SPECFEM3D/trunk/src/generate_databases/Makefile.in 2013-10-08 00:02:41 UTC (rev 22934)
@@ -54,7 +54,7 @@
ADIOS_LIB_LOCATION = @ADIOS_LIB@ @MXML_LIB@
ADIOS_LINK = $(ADIOS_LIB_LOCATION) $(ADIOS_LIBS)
-ADIOS_INC = @ADIOS_INC@ -I../../setup -I../../
+ADIOS_INC = @ADIOS_INC@ -I../../
FCCOMPILE_CHECK =@FCENV@ ${FC} ${FCFLAGS} $(FLAGS_CHECK) -I${SHARED} ${ADIOS_LINK}
MPIFCCOMPILE_CHECK =@FCENV@ ${MPIFC} ${FCFLAGS} $(FLAGS_CHECK) -I${SHARED} ${ADIOS_LINK}
Modified: seismo/3D/SPECFEM3D/trunk/src/meshfem3D/Makefile.in
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/meshfem3D/Makefile.in 2013-10-08 00:00:15 UTC (rev 22933)
+++ seismo/3D/SPECFEM3D/trunk/src/meshfem3D/Makefile.in 2013-10-08 00:02:41 UTC (rev 22934)
@@ -51,7 +51,7 @@
ADIOS_LIB_LOCATION = @ADIOS_LIB@ @MXML_LIB@
ADIOS_LINK = $(ADIOS_LIB_LOCATION) $(ADIOS_LIBS)
-ADIOS_INC = @ADIOS_INC@ -I../../setup -I../../
+ADIOS_INC = @ADIOS_INC@ -I../../
FCCOMPILE_CHECK =@FCENV@ ${FC} ${FCFLAGS} $(FLAGS_CHECK) -I${SHARED} ${ADIOS_LINK}
MPIFCCOMPILE_CHECK =@FCENV@ ${MPIFC} ${FCFLAGS} $(FLAGS_CHECK) -I${SHARED} ${ADIOS_LINK}
Modified: seismo/3D/SPECFEM3D/trunk/src/specfem3D/Makefile.in
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/specfem3D/Makefile.in 2013-10-08 00:00:15 UTC (rev 22933)
+++ seismo/3D/SPECFEM3D/trunk/src/specfem3D/Makefile.in 2013-10-08 00:02:41 UTC (rev 22934)
@@ -307,9 +307,9 @@
ADIOS_LIB_LOCATION = @ADIOS_LIB@ @MXML_LIB@
ADIOS_LINK = $(ADIOS_LIB_LOCATION) $(ADIOS_LIBS)
-ADIOS_INC = @ADIOS_INC@ -I../../setup -I../../
+ADIOS_INC = @ADIOS_INC@ -I../../
-#@COND_ADIOS_TRUE at CPPFLAGS = -I../../setup @CPPFLAGS@
+#@COND_ADIOS_TRUE at CPPFLAGS = @CPPFLAGS@
@COND_ADIOS_TRUE at MPIFCCOMPILE_CHECK =@FCENV@ ${MPIFC} ${FCFLAGS} $(ADIOS_INC) $(FLAGS_CHECK)
@COND_ADIOS_TRUE at MPIFCCOMPILE_NO_CHECK =@FCENV@ ${MPIFC} ${FCFLAGS} $(ADIOS_INC) $(FLAGS_NO_CHECK)
More information about the CIG-COMMITS
mailing list