Skip to content

Commit

Permalink
Integration of Component ModelicaCompiler to cpp runtime in CMake Fil…
Browse files Browse the repository at this point in the history
…e and LibrariesConfig.h.in

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@24072 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
nimen committed Jan 16, 2015
1 parent 3b283b6 commit db2e82f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
5 changes: 5 additions & 0 deletions SimulationRuntime/cpp/CMakeLists.txt
Expand Up @@ -64,6 +64,7 @@ SET(DataExchangeName ${LIBPREFIX}DataExchange)
SET(ModelicaUtilitiesName ${LIBPREFIX}ModelicaUtilities)
SET(ExtensionUtilitiesName ${LIBPREFIX}ExtensionUtilities)
SET(BasiLibName ${LIBPREFIX}Base)
SET(ModelicaCompilerName ${LIBPREFIX}ModelicaCompiler)

SET(USE_MICO OFF)
SET(REDUCE_DAE OFF)
Expand Down Expand Up @@ -325,6 +326,7 @@ include_directories ("Include")
include_directories ("Solver")


#add_subdirectory (ModelicaCompiler)
add_subdirectory (Core/Math)

add_subdirectory (Core/Utils/Modelica)
Expand Down Expand Up @@ -420,6 +422,8 @@ GET_FILENAME_COMPONENT(libMathName ${libMath} NAME)
GET_TARGET_PROPERTY(libDataExchange ${DataExchangeName} LOCATION)
GET_FILENAME_COMPONENT(libDataExchangeName ${libDataExchange} NAME)

GET_TARGET_PROPERTY(libModelicaCompiler ${ModelicaCompilerName} LOCATION)
GET_FILENAME_COMPONENT(libModelicaCompilerName ${libModelicaCompiler} NAME)

GET_TARGET_PROPERTY(libSimObjFactory ${OMCFactoryName} LOCATION)
GET_FILENAME_COMPONENT(libSimObjFactoryName ${libSimObjFactory} NAME)
Expand All @@ -439,6 +443,7 @@ set (SIMOBJFACTORY_LIB ${libSimObjFactoryName})
set (DATAEXCHANGE_LIB ${libDataExchangeName})
set (SIMCONRTOLLER_LIB ${libSimControllerName})
set (EXTENSIONUTILITIES_LIB ${libExtensionUtilitiesName})
set (MODELICACOMPILER_LIB ${libModelicaCompilerName})

# configure a header file to pass some library names
# to the source code which are used to dynamic load and instantiate
Expand Down
3 changes: 2 additions & 1 deletion SimulationRuntime/cpp/LibrariesConfig.h.in
Expand Up @@ -17,4 +17,5 @@
#define SIMOBJFACTORY_LIB "@SIMOBJFACTORY_LIB@"
#define DATAEXCHANGE_LIB "@DATAEXCHANGE_LIB@"
#define SIMCONRTOLLER_LIB "@SIMCONRTOLLER_LIB@"
#define EXTENSIONUTILITIES_LIB "@EXTENSIONUTILITIES_LIB@"
#define EXTENSIONUTILITIES_LIB "@EXTENSIONUTILITIES_LIB@"
#define MODELICACOMPILER_LIB "@MODELICACOMPILER_LIB@"

0 comments on commit db2e82f

Please sign in to comment.