Merge 9f16851 into 90dac32

OpenCMISS · Feb 17, 2018 · 42ed988 · 42ed988
2 parents 90dac32 + 9f16851
commit 42ed988
Show file tree

Hide file tree

Showing 33 changed files with 12,528 additions and 2,269 deletions.
diff --git a/cmake/Sources.cmake b/cmake/Sources.cmake
@@ -9,6 +9,8 @@ set(IRON_HEADERS
     external_dae_solver_routines.h
     FieldExport.h
     FieldExportConstants.h
+    macros.h
+    dllexport.h
 )
 set(IRON_Fortran_SRC
     advection_diffusion_equation_routines.f90
@@ -152,4 +154,4 @@ foreach(varname ${FIXPATH_VARS})
 endforeach()
 
 # Set combined sources variable
-set(IRON_SRC ${IRON_C_SRC} ${IRON_Fortran_SRC})
+set(IRON_SRC ${IRON_C_SRC} ${IRON_Fortran_SRC})
diff --git a/doc/latex/texTextPreamble.ini b/doc/latex/texTextPreamble.ini
@@ -0,0 +1,3 @@
+\input{/data/OpenCMISS/cm/doc/latex/macros}
+\input{/data/OpenCMISS/cm/doc/latex/defns} 
+\input{/data/OpenCMISS/cm/doc/latex/abbreviations}