Changeset b3cae5

Timestamp:

Feb 15, 2017, 4:39:24 PM (9 years ago)

Author:

Frederik Heber <heber@…>

Children:

dee3f2

Parents:

9cebf9

Message:

Made interface_fcs compilation depend on whether we are inside fcs.

Files:

• configure.ac (modified) (2 diffs)
• src/Makefile.am (modified) (4 diffs)

configure.ac

@@ -224 +224 @@
 
 # Set up information for FCS package if inside the FCS tree.
+have_fcs="no"
 m4_ifdef([AX_FCS_PACKAGE_RESET],[
 AX_FCS_PACKAGE_RESET
@@ -230 +231 @@
 AX_FCS_PACKAGE_ADD([vmg_LDADD],[$VTK_LDFLAGS $VTK_LIBS $BOOST_SYSTEM_LDFLAGS $BOOST_SYSTEM_LIBS $BOOST_FILESYSTEM_LDFLAGS $BOOST_FILESYSTEM_LIBS $LAPACK_LIBS $BLAS_LIBS])
 AX_FCS_PACKAGE_ADD([CXXLIBS_USE],[yes])
-])
+have_fsc="yes"
+])
+AM_CONDITIONAL(COND_HAVE_FCS, [test x"have_fcs" = xyes])
 
 # Checks for structures.

src/Makefile.am

@@ -87 +87 @@
         units/particle/bspline.cpp \
         units/particle/comm_mpi_particle.cpp \
-        units/particle/interface_fcs.cpp \
-        units/particle/interface_fcs.h \
         units/particle/interface_particles.cpp \
         units/particle/interpolation.cpp \
@@ -94 +92 @@
         units/particle/particle.cpp \
         mg.cpp
+        
+VMGFCSSOURCES = \
+        units/particle/interface_fcs.cpp
+
+VMGFCSHEADERS = \
+        units/particle/interface_fcs.h
 
 VMGHEADERS =  \
@@ -189 +193 @@
 
 nobase_libvmg_la_include_HEADERS = ${VMGHEADERS}
+if COND_HAVE_FCS
+nobase_libvmg_la_include_HEADERS += ${VMGFCSHEADERS}
+endif
 
 ## Define the source file list for the "libexample-@MOLECUILDER_API_VERSION@.la"
@@ -199 +206 @@
 ## which are already listed elsewhere in a _HEADERS variable assignment.
 libvmg_la_SOURCES = ${VMGSOURCES}
+if COND_HAVE_FCS
+libvmg_la_SOURCES += ${VMGFCSSOURCES}
+endif
 
 ## Instruct libtool to include ABI version information in the generated shared