cellmlapi · sgenie68 · Nov 12, 2014 · Nov 13, 2014 · Nov 26, 2014 · Nov 26, 2014
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+ocmbuild
 *.la
 *.a
 *.so

diff --git a/.hgignore b/.hgignore
diff --git a/.project b/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>LibCellML</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/AUTHORS b/AUTHORS
diff --git a/AnnoTools/annotools.cmake b/AnnoTools/annotools.cmake
@@ -10,8 +10,13 @@ INCLUDE_DIRECTORIES(AnnoTools/sources)
 ADD_LIBRARY(annotools
   AnnoTools/sources/ATImplementation.cpp)
 TARGET_LINK_LIBRARIES(annotools cellml ${CMAKE_DL_LIBS})
+target_link_libraries(libcellml INTERFACE annotools)
 SET_TARGET_PROPERTIES(annotools PROPERTIES VERSION ${GLOBAL_VERSION} SOVERSION ${ANNOTOOLS_SOVERSION})
-INSTALL(TARGETS annotools DESTINATION lib)
+INSTALL(TARGETS annotools
+    EXPORT libcellml-config
+    DESTINATION lib
+    INCLUDES DESTINATION ${LIBCELLML_INCLUDE_DEST})
+INSTALL(FILES AnnoTools/sources/AnnoToolsBootstrap.hpp DESTINATION ${LIBCELLML_INCLUDE_DEST})    
 
 DECLARE_BOOTSTRAP("AnnoToolsBootstrap" "AnnoTools" "AnnotationToolService" "cellml_services" "createAnnotationToolService" "CreateAnnotationToolService" "AnnoToolsBootstrap.hpp" "AnnoTools/sources" "annotools")
 DECLARE_CPPUNIT_FILE(AnnoTools)

diff --git a/AnnoTools/sources/ATImplementation.cpp b/AnnoTools/sources/ATImplementation.cpp
diff --git a/AnnoTools/sources/ATImplementation.hpp b/AnnoTools/sources/ATImplementation.hpp
diff --git a/AnnoTools/sources/AnnoToolsBootstrap.hpp b/AnnoTools/sources/AnnoToolsBootstrap.hpp
diff --git a/AnnoTools/sources/AnnoToolsBootstrapJava.cpp b/AnnoTools/sources/AnnoToolsBootstrapJava.cpp
diff --git a/AnnoTools/sources/AnnoToolsBootstrapXPCOM.cpp b/AnnoTools/sources/AnnoToolsBootstrapXPCOM.cpp
diff --git a/CCGS/ccgs.cmake b/CCGS/ccgs.cmake
@@ -12,9 +12,14 @@ INCLUDE_DIRECTORIES(CCGS/sources)
 ADD_LIBRARY(ccgs
   CCGS/sources/CCGSImplementation.cpp
   CCGS/sources/CCGSGenerator.cpp)
-TARGET_LINK_LIBRARIES(ccgs cuses cevas malaes annotools cellml ${CMAKE_DL_LIBS})
+TARGET_LINK_LIBRARIES(ccgs PUBLIC cuses cevas malaes annotools cellml ${CMAKE_DL_LIBS})
 SET_TARGET_PROPERTIES(ccgs PROPERTIES VERSION ${GLOBAL_VERSION} SOVERSION ${CCGS_SOVERSION})
-INSTALL(TARGETS ccgs DESTINATION lib)
+target_link_libraries(libcellml INTERFACE ccgs)
+INSTALL(TARGETS ccgs
+    EXPORT libcellml-config
+    DESTINATION lib
+    INCLUDES DESTINATION ${LIBCELLML_INCLUDE_DEST})
+INSTALL(FILES CCGS/sources/CCGSBootstrap.hpp DESTINATION ${LIBCELLML_INCLUDE_DEST})    
 
 DECLARE_BOOTSTRAP("CCGSBootstrap" "CCGS" "CodeGeneratorBootstrap" "cellml_services" "createCodeGeneratorBootstrap" "CreateCodeGeneratorBootstrap" "CCGSBootstrap.hpp" "CCGS/sources" "ccgs")
 

diff --git a/CGRS/cgrs-interface.cmake b/CGRS/cgrs-interface.cmake
@@ -12,6 +12,7 @@ ADD_LIBRARY(cgrs
   CGRS/CGRSImplementation.cpp)
 TARGET_LINK_LIBRARIES(cgrs ${CMAKE_DL_LIBS} cellml)
 SET_TARGET_PROPERTIES(cgrs PROPERTIES VERSION ${GLOBAL_VERSION} SOVERSION ${CGRS_SOVERSION})
+target_link_libraries(libcellml INTERFACE cgrs)
 INSTALL(TARGETS cgrs DESTINATION lib)
 
 DECLARE_BOOTSTRAP("CGRSBootstrap" "CGRS" "GenericsService" "CGRS" "createGenericsService" "CreateGenericsService" "CGRSBootstrap.hpp" "CGRS" "cgrs")

diff --git a/CGRS/cgrs-modules.cmake b/CGRS/cgrs-modules.cmake
@@ -51,5 +51,6 @@ FOREACH(extension ${EXTENSION_LIST_MODIFIED})
   ELSE()
     TARGET_LINK_LIBRARIES(cgrs_xpcom cgrs ${deplibs})
   ENDIF()
+  target_link_libraries(libcellml INTERFACE cgrs_${extension})
   INSTALL(TARGETS cgrs_${extension} DESTINATION lib/cgrs_modules)
 ENDFOREACH(extension)
diff --git a/CIS/cis.cmake b/CIS/cis.cmake
@@ -141,7 +141,7 @@ ADD_CUSTOM_COMMAND(
   )
 # ADD_DEPENDENCIES(cis "${CMAKE_BINARY_DIR}/CISModelSupportString.h")
 ADD_CUSTOM_TARGET(CIS_MODEL_SUPPORT_STRING ALL DEPENDS "${CMAKE_BINARY_DIR}/CISModelSupportString.h")
-
+target_link_libraries(libcellml INTERFACE cis)
 INSTALL(TARGETS cis DESTINATION lib)
 
 IF(ENABLE_GSL_INTEGRATORS)

diff --git a/CIS/sources/ModelAsString b/CIS/sources/ModelAsString
diff --git a/CIS/sources/ida/ida_direct_impl.h b/CIS/sources/ida/ida_direct_impl.h
diff --git a/CIS/sources/ida/ida_ic.c b/CIS/sources/ida/ida_ic.c
diff --git a/CIS/sources/ida/ida_impl.h b/CIS/sources/ida/ida_impl.h
diff --git a/CIS/sources/ida/ida_io.c b/CIS/sources/ida/ida_io.c
diff --git a/CIS/sources/ida/ida_spbcgs.c b/CIS/sources/ida/ida_spbcgs.c
diff --git a/CIS/sources/ida/ida_spbcgs.h b/CIS/sources/ida/ida_spbcgs.h
diff --git a/CIS/sources/ida/ida_spgmr.c b/CIS/sources/ida/ida_spgmr.c
diff --git a/CIS/sources/ida/ida_spgmr.h b/CIS/sources/ida/ida_spgmr.h
diff --git a/CIS/sources/ida/ida_spils.c b/CIS/sources/ida/ida_spils.c
diff --git a/CIS/sources/ida/ida_spils.h b/CIS/sources/ida/ida_spils.h
diff --git a/CIS/sources/ida/ida_spils_impl.h b/CIS/sources/ida/ida_spils_impl.h
diff --git a/CIS/sources/ida/ida_sptfqmr.c b/CIS/sources/ida/ida_sptfqmr.c
diff --git a/CIS/sources/ida/ida_sptfqmr.h b/CIS/sources/ida/ida_sptfqmr.h
diff --git a/CIS/sources/nvec_ser/nvector_serial.c b/CIS/sources/nvec_ser/nvector_serial.c
diff --git a/CIS/sources/nvector/nvector_serial.h b/CIS/sources/nvector/nvector_serial.h
diff --git a/CIS/sources/sundials/LICENSE b/CIS/sources/sundials/LICENSE
diff --git a/CIS/sources/sundials/sundials_band.c b/CIS/sources/sundials/sundials_band.c
diff --git a/CIS/sources/sundials/sundials_band.h b/CIS/sources/sundials/sundials_band.h
diff --git a/CIS/sources/sundials/sundials_config.h b/CIS/sources/sundials/sundials_config.h
diff --git a/CIS/sources/sundials/sundials_dense.c b/CIS/sources/sundials/sundials_dense.c
diff --git a/CIS/sources/sundials/sundials_dense.h b/CIS/sources/sundials/sundials_dense.h
diff --git a/CIS/sources/sundials/sundials_direct.c b/CIS/sources/sundials/sundials_direct.c
diff --git a/CIS/sources/sundials/sundials_direct.h b/CIS/sources/sundials/sundials_direct.h
diff --git a/CIS/sources/sundials/sundials_fnvector.h b/CIS/sources/sundials/sundials_fnvector.h
diff --git a/CIS/sources/sundials/sundials_iterative.c b/CIS/sources/sundials/sundials_iterative.c
diff --git a/CIS/sources/sundials/sundials_iterative.h b/CIS/sources/sundials/sundials_iterative.h
diff --git a/CIS/sources/sundials/sundials_math.c b/CIS/sources/sundials/sundials_math.c
diff --git a/CIS/sources/sundials/sundials_math.h b/CIS/sources/sundials/sundials_math.h
diff --git a/CIS/sources/sundials/sundials_nvector.c b/CIS/sources/sundials/sundials_nvector.c
diff --git a/CIS/sources/sundials/sundials_nvector.h b/CIS/sources/sundials/sundials_nvector.h
diff --git a/CIS/sources/sundials/sundials_smalldense.c b/CIS/sources/sundials/sundials_smalldense.c
diff --git a/CIS/sources/sundials/sundials_smalldense.h b/CIS/sources/sundials/sundials_smalldense.h
diff --git a/CIS/sources/sundials/sundials_spbcgs.c b/CIS/sources/sundials/sundials_spbcgs.c
diff --git a/CIS/sources/sundials/sundials_spbcgs.h b/CIS/sources/sundials/sundials_spbcgs.h
diff --git a/CIS/sources/sundials/sundials_spgmr.c b/CIS/sources/sundials/sundials_spgmr.c
diff --git a/CIS/sources/sundials/sundials_spgmr.h b/CIS/sources/sundials/sundials_spgmr.h
diff --git a/CIS/sources/sundials/sundials_sptfqmr.c b/CIS/sources/sundials/sundials_sptfqmr.c
diff --git a/CIS/sources/sundials/sundials_sptfqmr.h b/CIS/sources/sundials/sundials_sptfqmr.h
diff --git a/CIS/sources/sundials/sundials_types.h b/CIS/sources/sundials/sundials_types.h
diff --git a/CIS/tests/RunCellML.cpp b/CIS/tests/RunCellML.cpp
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,46 +1,45 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
-SET(CMAKE_BACKWARDS_COMPATIBILITY 2.8)
-MARK_AS_ADVANCED(CMAKE_BACKWARDS_COMPATIBILITY)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0)
+project(LIBCELLML VERSION 2.0 LANGUAGES C CXX)
 
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/COPYING DESTINATION share/doc/cellml-api/)
+set(PACKAGE_CONFIG_DIR "lib/cmake" CACHE STRING "Directory for package config files (relative to CMAKE_INSTALL_PREFIX)")
+set(USE_SYSTEM_LIBXML2 YES)
 
 INCLUDE(build/soversions.cmake)
-INCLUDE(CTest)
 INCLUDE(build/packing.cmake)
+INCLUDE(CTest)
 
-OPTION(ENABLE_EVERYTHING "Turn on all optional features, except the commonly problematic ones (XPCOM, CORBA, and GSL integrators).")
+OPTION(ENABLE_EVERYTHING "Turn on all optional features, except the commonly problematic ones (XPCOM, CORBA, and GSL integrators)." OFF)
 
-OPTION(ENABLE_CORBA "Generate a two-way bridge between the C++ implementation and CORBA, allowing all parts of the API to be accessed from CORBA. Note: this functionality is not widely tested; if you find a bug, we are only interested if you also provide a working patch to fix the problem")
+OPTION(ENABLE_CORBA "Generate a two-way bridge between the C++ implementation and CORBA, allowing all parts of the API to be accessed from CORBA. Note: this functionality is not widely tested; if you find a bug, we are only interested if you also provide a working patch to fix the problem" OFF)
 MARK_AS_ADVANCED(FORCE ENABLE_CORBA)
-OPTION(ENABLE_XPCOM "Generate XPIDL interfaces and a two-way bridge between the C++ implementation and XPCOM, allowing all parts of the API to be accessed from XPCOM. Note: this functionality is not widely tested; if you find a bug, we are only interested if you also provide a working patch to fix the problem")
-OPTION(ENABLE_JAVA_BUILD "Build Java interfaces and a bridge between the C++ implementation and Java, allowing all parts of the API to be accessed from Java.")
+OPTION(ENABLE_XPCOM "Generate XPIDL interfaces and a two-way bridge between the C++ implementation and XPCOM, allowing all parts of the API to be accessed from XPCOM. Note: this functionality is not widely tested; if you find a bug, we are only interested if you also provide a working patch to fix the problem" OFF)
+OPTION(ENABLE_JAVA_BUILD "Build Java interfaces and a bridge between the C++ implementation and Java, allowing all parts of the API to be accessed from Java." OFF)
 
 MARK_AS_ADVANCED(FORCE ENABLE_XPCOM)
 SET(XULRUNNER_SDK_PATH "/usr/local/xulrunner-sdk" CACHE PATH "This property is only used when XPCOM support has been enabled. It determines the path to the xulrunner SDK used to build the XPCOM bridge")
 MARK_AS_ADVANCED(FORCE XULRUNNER_SDK_PATH)
 
-OPTION(ENABLE_ANNOTOOLS "Build AnnoTools, a service for handling sets of annotations of different types against parts of models.")
-OPTION(ENABLE_CCGS "Build the CellML Code Generation Service (CCGS), allowing CellML models to be translated into code in a customisable procedural language")
-OPTION(ENABLE_CELEDS "Build the CellML Language Export Definition Service (CeLEDS), allowing an XML description of a translation from MathML to a text-based format to be applied to MathML")
-OPTION(ENABLE_CELEDS_EXPORTER "Build the CellML Language Export Definition Exporter Service (CeLEDSExporter), allowing an XML description of a translation from CellML to a text-based format to be applied to CellML to generate procedural code")
-OPTION(ENABLE_CIS "Build the CellML Integration Service, which allows simulations to be run from CellML models")
-OPTION(ENABLE_CUSES "Build the CellML Units Simplification and Expansion Service (CUSES), allowing the canonicalisation and compare units in CellML models")
-OPTION(ENABLE_CEVAS "Build the CellML Variable Association Service (CeVAS), allowing information on which variables are connected to be easily obtained")
-OPTION(ENABLE_CONTEXT "Build the CellML Context, a service for maintaining a global list of models that are open")
-OPTION(ENABLE_EXAMPLES "Build the example programs in the example subdirectory")
-OPTION(ENABLE_GSL_INTEGRATORS "Build GSL integrators in CCGS (note: binaries linked against GSL contain code that is only available under the GNU GPL license)")
-OPTION(ENABLE_MALAES "Build the MathML to Language Expression Service (MaLaES), allowing the translation of a MathML expressions into text in a customised form")
-OPTION(ENABLE_MOFS "Build the Model Flattening Service (MoFS) for flattening CellML 1.1 models into CellML 1.0 models")
-OPTION(ENABLE_RDF "Enable the RDF library, which provides access to RDF as triples")
-OPTION(ENABLE_SPROS "Enable SProS, the SED-ML Processing Service, for manipulating and creating SED-ML descriptions of simulation experiments")
-OPTION(ENABLE_SRUS "Enable SRuS, the SED-ML Running Service, for running simulations from SED-ML simulation experiments")
-OPTION(ENABLE_SPROS "Enable SProS, the SED-ML Processing Service, for manipulating and creating SED-ML descriptions of simulation experiments")
-OPTION(ENABLE_TELICEMS "Enable the TeLICeM (Text-based Language for the Input of CellML Models) Service")
-OPTION(ENABLE_VACSS "Build the Validation Against CellML Specification Service (VACSS), allowing CellML models to be validated to detect potential or actual problems with the model")
-OPTION(ENABLE_CGRS "Build the CellML Generics and Reflection Service (CGRS), providing access to the CellML API through a generic interface that allows each operation and attribute in the API to be discovered programmatically.")
+OPTION(ENABLE_ANNOTOOLS "Build AnnoTools, a service for handling sets of annotations of different types against parts of models." ON)
+OPTION(ENABLE_CCGS "Build the CellML Code Generation Service (CCGS), allowing CellML models to be translated into code in a customisable procedural language" ON)
+OPTION(ENABLE_CELEDS "Build the CellML Language Export Definition Service (CeLEDS), allowing an XML description of a translation from MathML to a text-based format to be applied to MathML" OFF)
+OPTION(ENABLE_CELEDS_EXPORTER "Build the CellML Language Export Definition Exporter Service (CeLEDSExporter), allowing an XML description of a translation from CellML to a text-based format to be applied to CellML to generate procedural code" OFF)
+OPTION(ENABLE_CIS "Build the CellML Integration Service, which allows simulations to be run from CellML models" OFF)
+OPTION(ENABLE_CUSES "Build the CellML Units Simplification and Expansion Service (CUSES), allowing the canonicalisation and compare units in CellML models" ON)
+OPTION(ENABLE_CEVAS "Build the CellML Variable Association Service (CeVAS), allowing information on which variables are connected to be easily obtained" OFF)
+OPTION(ENABLE_CONTEXT "Build the CellML Context, a service for maintaining a global list of models that are open" ON)
+OPTION(ENABLE_EXAMPLES "Build the example programs in the example subdirectory" ON)
+OPTION(ENABLE_GSL_INTEGRATORS "Build GSL integrators in CCGS (note: binaries linked against GSL contain code that is only available under the GNU GPL license)" OFF)
+OPTION(ENABLE_MALAES "Build the MathML to Language Expression Service (MaLaES), allowing the translation of a MathML expressions into text in a customised form" ON)
+OPTION(ENABLE_MOFS "Build the Model Flattening Service (MoFS) for flattening CellML 1.1 models into CellML 1.0 models" OFF)
+OPTION(ENABLE_RDF "Enable the RDF library, which provides access to RDF as triples" OFF)
+OPTION(ENABLE_SPROS "Enable SProS, the SED-ML Processing Service, for manipulating and creating SED-ML descriptions of simulation experiments" OFF)
+OPTION(ENABLE_SRUS "Enable SRuS, the SED-ML Running Service, for running simulations from SED-ML simulation experiments" OFF)
+OPTION(ENABLE_SPROS "Enable SProS, the SED-ML Processing Service, for manipulating and creating SED-ML descriptions of simulation experiments" OFF)
+OPTION(ENABLE_TELICEMS "Enable the TeLICeM (Text-based Language for the Input of CellML Models) Service" OFF)
+OPTION(ENABLE_VACSS "Build the Validation Against CellML Specification Service (VACSS), allowing CellML models to be validated to detect potential or actual problems with the model" ON)
+OPTION(ENABLE_CGRS "Build the CellML Generics and Reflection Service (CGRS), providing access to the CellML API through a generic interface that allows each operation and attribute in the API to be discovered programmatically." OFF)
 
 OPTION(CHECK_BUILD "Run some basic checks on whether the build is likely to succeed before actually building" ON)
-OPTION(BUILD_SHARED_LIBS "Build shared libraries" ON)
 
 # Option Dependencies...
 # These must be ordered so modules come before their dependencies.
@@ -87,6 +86,11 @@ ENDIF()
 
 INCLUDE(FindThreads)
 
+# Use common include directory
+SET(LIBCELLML_INCLUDE_DEST include/cellml)
+
+add_library(libcellml INTERFACE)
+
 INCLUDE(build/idl.cmake)
 INCLUDE(build/bootstraps.cmake)
 INCLUDE(build/test_init.cmake)
@@ -159,7 +163,7 @@ INCLUDE(build/test.cmake)
 
 # Do all the language specific bits...
 
-INCLUDE(build/cxx.cmake)
+#INCLUDE(build/cxx.cmake)
 
 IF (ENABLE_CGRS)
   INCLUDE(CGRS/cgrs-modules.cmake)
@@ -399,6 +403,21 @@ CONFIGURE_FILE(cda_config.h.in cda_config.h)
 CONFIGURE_FILE(extdep/libxml/xml2_config.h.in extdep/libxml/xml2_config.h)
 INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/extdep/libxml/)
 
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/COPYING DESTINATION share/doc/cellml-api/)
+
+# Use one-time-generated hxx headers
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
+# export them to the cellml include directory
+INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION ${LIBCELLML_INCLUDE_DEST})
+
+install(TARGETS libcellml EXPORT libcellml-config)
+
+install(EXPORT libcellml-config DESTINATION ${PACKAGE_CONFIG_DIR})
+include(CMakePackageConfigHelpers)
+WRITE_BASIC_PACKAGE_VERSION_FILE(${CMAKE_CURRENT_BINARY_DIR}/libcellml-config-version.cmake COMPATIBILITY AnyNewerVersion)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libcellml-config-version.cmake 
+    DESTINATION ${PACKAGE_CONFIG_DIR})
+
 # uninstall target
 CONFIGURE_FILE(
     "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"

diff --git a/COPYING b/COPYING
diff --git a/CUSES/cuses.cmake b/CUSES/cuses.cmake
@@ -9,7 +9,8 @@ ADD_LIBRARY(cuses
   CUSES/sources/CUSESImpl.cpp)
 TARGET_LINK_LIBRARIES(cuses annotools cellml ${CMAKE_DL_LIBS})
 SET_TARGET_PROPERTIES(cuses PROPERTIES VERSION ${GLOBAL_VERSION} SOVERSION ${CUSES_SOVERSION})
-INSTALL(TARGETS cuses DESTINATION lib)
+target_link_libraries(libcellml INTERFACE cuses)
+INSTALL(TARGETS cuses EXPORT libcellml-config DESTINATION lib)
 
 DECLARE_BOOTSTRAP("CUSESBootstrap" "CUSES" "CUSESBootstrap" "cellml_services" "createCUSESBootstrap" "CreateCUSESBootstrap" "CUSESBootstrap.hpp" "CUSES/sources" "cuses")
 

diff --git a/CUSES/sources/CUSESBootstrap.hpp b/CUSES/sources/CUSESBootstrap.hpp
diff --git a/CUSES/sources/CUSESBootstrapJava.cpp b/CUSES/sources/CUSESBootstrapJava.cpp
diff --git a/CUSES/sources/CUSESBootstrapXPCOM.cpp b/CUSES/sources/CUSESBootstrapXPCOM.cpp
diff --git a/CUSES/sources/CUSESImpl.cpp b/CUSES/sources/CUSESImpl.cpp
diff --git a/CUSES/sources/CUSESImpl.hpp b/CUSES/sources/CUSESImpl.hpp
diff --git a/CeLEDS/celeds.cmake b/CeLEDS/celeds.cmake
@@ -10,6 +10,7 @@ ADD_LIBRARY(celeds
   CeLEDS/sources/CeLEDSImpl.cpp)
 TARGET_LINK_LIBRARIES(celeds cellml malaes ${CMAKE_DL_LIBS})
 SET_TARGET_PROPERTIES(celeds PROPERTIES VERSION ${GLOBAL_VERSION} SOVERSION ${CELEDS_SOVERSION})
-INSTALL(TARGETS celeds DESTINATION lib)
+target_link_libraries(libcellml INTERFACE celeds)
+INSTALL(TARGETS celeds EXPORT libcellml-config DESTINATION lib)
 
 DECLARE_BOOTSTRAP("CeLEDSBootstrap" "CeLEDS" "CeLEDSBootstrap" "cellml_services" "createCeLEDSBootstrap" "CreateCeLEDSBootstrap" "CeLEDSBootstrap.hpp" "CeLEDS/sources" "celeds")
diff --git a/CeLEDSExporter/celeds_exporter.cmake b/CeLEDSExporter/celeds_exporter.cmake
@@ -10,6 +10,7 @@ ADD_LIBRARY(celedsexporter
   CeLEDSExporter/sources/CeLEDSExporterImpl.cpp)
 TARGET_LINK_LIBRARIES(celedsexporter celeds ccgs ${CMAKE_DL_LIBS})
 SET_TARGET_PROPERTIES(celedsexporter PROPERTIES VERSION ${GLOBAL_VERSION} SOVERSION ${CELEDS_EXPORTER_SOVERSION})
+target_link_libraries(libcellml INTERFACE celedsexporter)
 INSTALL(TARGETS celedsexporter DESTINATION lib)
 
 DECLARE_BOOTSTRAP("CeLEDSExporterBootstrap" "CeLEDSExporter" "CeLEDSExporterBootstrap" "cellml_services" "createCeLEDSExporterBootstrap" "CreateCeLEDSExporterBootstrap" "CeLEDSExporterBootstrap.hpp" "CeLEDSExporter/sources" "celeds_exporter")

diff --git a/CeVAS/cevas.cmake b/CeVAS/cevas.cmake
@@ -7,9 +7,14 @@ INCLUDE_DIRECTORIES(CeVAS/sources)
 
 ADD_LIBRARY(cevas
   CeVAS/sources/CeVASImpl.cpp)
-INSTALL(TARGETS cevas DESTINATION lib)
+INSTALL(TARGETS cevas 
+    EXPORT libcellml-config
+    DESTINATION lib
+    INCLUDES DESTINATION ${LIBCELLML_INCLUDE_DEST})
 SET_TARGET_PROPERTIES(cevas PROPERTIES VERSION ${GLOBAL_VERSION} SOVERSION ${CEVAS_SOVERSION})
 TARGET_LINK_LIBRARIES(cevas cellml ${CMAKE_DL_LIBS})
+target_link_libraries(libcellml INTERFACE cevas)
+INSTALL(FILES CeVAS/sources/CeVASBootstrap.hpp DESTINATION ${LIBCELLML_INCLUDE_DEST})
 
 DECLARE_BOOTSTRAP("CeVASBootstrap" "CeVAS" "CeVASBootstrap" "cellml_services" "createCeVASBootstrap" "CreateCeVASBootstrap" "CeVASBootstrap.hpp" "CeVAS/sources" "cevas")
 

diff --git a/MaLaES/malaes.cmake b/MaLaES/malaes.cmake
@@ -10,7 +10,12 @@ INCLUDE_DIRECTORIES(MaLaES/sources)
 ADD_LIBRARY(malaes
   MaLaES/sources/MaLaESImpl.cpp)
 SET_TARGET_PROPERTIES(malaes PROPERTIES VERSION ${GLOBAL_VERSION} SOVERSION ${MALAES_SOVERSION})
-INSTALL(TARGETS malaes DESTINATION lib)
+target_link_libraries(libcellml INTERFACE malaes)
+INSTALL(TARGETS malaes
+    EXPORT libcellml-config
+    DESTINATION lib
+    INCLUDES DESTINATION ${LIBCELLML_INCLUDE_DEST})    
+INSTALL(FILES MaLaES/sources/MaLaESBootstrap.hpp DESTINATION ${LIBCELLML_INCLUDE_DEST})
 TARGET_LINK_LIBRARIES(malaes cellml ${CMAKE_DL_LIBS})
 
 DECLARE_BOOTSTRAP("MaLaESBootstrap" "MaLaES" "MaLaESBootstrap" "cellml_services" "createMaLaESBootstrap" "CreateMaLaESBootstrap" "MaLaESBootstrap.hpp" "MaLaES/sources" "malaes")

diff --git a/MoFS/mofs.cmake b/MoFS/mofs.cmake
@@ -8,6 +8,7 @@ INCLUDE_DIRECTORIES(MoFS)
 ADD_LIBRARY(mofs MoFS/MoFSImpl.cpp)
 TARGET_LINK_LIBRARIES(mofs cellml annotools cevas)
 SET_TARGET_PROPERTIES(mofs PROPERTIES VERSION ${GLOBAL_VERSION} SOVERSION ${MOFS_SOVERSION})
+target_link_libraries(libcellml INTERFACE mofs)
 INSTALL(TARGETS mofs DESTINATION lib)
 
 DECLARE_BOOTSTRAP("MoFSBootstrap" "MoFS" "ModelFlatteningService" "mofs" "createModelFlatteningService" "CreateModelFlatteningService" "MoFSBootstrap.hpp" "MoFS" "mofs")

diff --git a/SProS/spros.cmake b/SProS/spros.cmake
@@ -9,6 +9,7 @@ ADD_LIBRARY(spros
   SProS/sources/SProSImpl.cpp)
 TARGET_LINK_LIBRARIES(spros cellml ${CMAKE_DL_LIBS})
 SET_TARGET_PROPERTIES(spros PROPERTIES VERSION ${GLOBAL_VERSION} SOVERSION ${SPROS_SOVERSION})
+target_link_libraries(libcellml INTERFACE spros)
 INSTALL(TARGETS spros DESTINATION lib)
 
 DECLARE_BOOTSTRAP("SProSBootstrap" "SProS" "Bootstrap" "SProS" "createSProSBootstrap" "CreateSProSBootstrap" "SProSBootstrap.hpp" "SProS/sources" "spros")

diff --git a/SRuS/srus.cmake b/SRuS/srus.cmake
@@ -13,12 +13,13 @@ INCLUDE_DIRECTORIES(SRuS)
 INCLUDE_DIRECTORIES(xpath)
 
 ADD_LIBRARY(xpath xpath/XPathImpl.cpp)
-TARGET_LINK_LIBRARIES(xpath cellml)
+TARGET_LINK_LIBRARIES(xpath PUBLIC cellml)
 SET_TARGET_PROPERTIES(xpath PROPERTIES VERSION ${GLOBAL_VERSION} SOVERSION ${XPATH_SOVERSION})
 INSTALL(TARGETS xpath DESTINATION lib)
 ADD_LIBRARY(srus SRuS/SRuSImpl.cpp SRuS/SRuSEval.cpp)
-TARGET_LINK_LIBRARIES(srus xpath cis ${CMAKE_DL_LIBS})
+TARGET_LINK_LIBRARIES(srus PUBLIC xpath cis ${CMAKE_DL_LIBS})
 SET_TARGET_PROPERTIES(srus PROPERTIES VERSION ${GLOBAL_VERSION} SOVERSION ${SRUS_SOVERSION})
+target_link_libraries(libcellml INTERFACE srus)
 INSTALL(TARGETS srus DESTINATION lib)
 
 DECLARE_BOOTSTRAP("SRuSBootstrap" "SRuS" "Bootstrap" "SRuS" "createSRuSBootstrap" "CreateSRuSBootstrap" "SRuSBootstrap.hpp" "SRuS" "srus")

diff --git a/TeLICeMS/FixBison b/TeLICeMS/FixBison
diff --git a/TeLICeMS/telicems.cmake b/TeLICeMS/telicems.cmake
@@ -17,6 +17,7 @@ ADD_LIBRARY(telicems
   ${CMAKE_BINARY_DIR}/TeLICeMParse.genf.cpp)
 TARGET_LINK_LIBRARIES(telicems cellml ${CMAKE_DL_LIBS})
 SET_TARGET_PROPERTIES(telicems PROPERTIES VERSION ${GLOBAL_VERSION} SOVERSION ${TELICEMS_SOVERSION})
+target_link_libraries(libcellml INTERFACE telicems)
 INSTALL(TARGETS telicems DESTINATION lib)
 
 DECLARE_BOOTSTRAP("TeLICeMSService" "TeLICeMS" "TeLICeMService" "cellml_services" "createTeLICeMService" "CreateTeLICeMService" "TeLICeMService.hpp" "TeLICeMS/sources" "telicems")

diff --git a/VACSS/vacss.cmake b/VACSS/vacss.cmake
@@ -9,7 +9,8 @@ ADD_LIBRARY(vacss
   VACSS/sources/VACSSImpl.cpp)
 TARGET_LINK_LIBRARIES(vacss cuses cellml ${CMAKE_DL_LIBS})
 SET_TARGET_PROPERTIES(vacss PROPERTIES VERSION ${GLOBAL_VERSION} SOVERSION ${VACSS_SOVERSION})
-INSTALL(TARGETS vacss DESTINATION lib)
+target_link_libraries(libcellml INTERFACE vacss)
+INSTALL(TARGETS vacss EXPORT libcellml-config DESTINATION lib)
 
 DECLARE_BOOTSTRAP("VACSSBootstrap" "VACSS" "VACSService" "cellml_services" "createVACSService" "CreateVACSService" "VACSSBootstrap.hpp" "VACSS/sources" "vacss")
 

diff --git a/build/bcc-wrapper b/build/bcc-wrapper
diff --git a/build/cygwin-wrapper b/build/cygwin-wrapper
-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    ocmbuild
     *.la
     *.a
     *.so
@@ Expand Down @@