Skip to content

Commit 9795b80

Browse files
committed
- Fix fmi path for msvc simulation runtime.
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@19879 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
1 parent 0dcdffc commit 9795b80

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

SimulationRuntime/c/CMakeLists.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ ENDIF(SUNDIALS_INCLUDE_DIR AND
346346
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/simulation/solver)
347347
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/simulation/solver/initialization)
348348
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/util)
349-
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/fmi/export)
349+
INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/fmi/export/fmi1)
350350

351351
# OMDEV PATH
352352
IF(NOT OMDEV)
@@ -380,9 +380,9 @@ ENDIF(SUNDIALS_INCLUDE_DIR AND
380380
# target fuer OM_OUTPUT
381381
ADD_CUSTOM_TARGET(${model}codegen ALL DEPENDS ${OMC_OUTPUT})
382382

383-
SET(OMC_FMU_CODE ${OMCTRUNCHOME}/SimulationRuntime/fmi/export/fmu_model_interface.h
384-
${OMCTRUNCHOME}/SimulationRuntime/fmi/export/fmiModelFunctions.h
385-
${OMCTRUNCHOME}/SimulationRuntime/fmi/export/fmiModelTypes.h)
383+
SET(OMC_FMU_CODE ${OMCTRUNCHOME}/SimulationRuntime/fmi/export/fmi1/fmu_model_interface.h
384+
${OMCTRUNCHOME}/SimulationRuntime/fmi/export/fmi1/fmiModelFunctions.h
385+
${OMCTRUNCHOME}/SimulationRuntime/fmi/export/fmi1/fmiModelTypes.h)
386386

387387
ADD_LIBRARY(${model} SHARED ${OMC_OUTPUT} ${CSRC} ${OMC_FMU_CODE})
388388
TARGET_LINK_LIBRARIES(${model} simulation util math-support results solver f2c meta ModelicaExternalC libexpat initialization lapack_win32_MT)
@@ -465,9 +465,9 @@ ENDIF(SUNDIALS_INCLUDE_DIR AND
465465
# target fuer OM_OUTPUT
466466
ADD_CUSTOM_TARGET(${model}codegen ALL DEPENDS ${OMC_OUTPUT})
467467

468-
SET(OMC_FMU_CODE ${OMCTRUNCHOME}/SimulationRuntime/fmi/export/fmu_model_interface.h
469-
${OMCTRUNCHOME}/SimulationRuntime/fmi/export/fmiModelFunctions.h
470-
${OMCTRUNCHOME}/SimulationRuntime/fmi/export/fmiModelTypes.h)
468+
SET(OMC_FMU_CODE ${OMCTRUNCHOME}/SimulationRuntime/fmi/export/fmi1/fmu_model_interface.h
469+
${OMCTRUNCHOME}/SimulationRuntime/fmi/export/fmi1/fmiModelFunctions.h
470+
${OMCTRUNCHOME}/SimulationRuntime/fmi/export/fmi1/fmiModelTypes.h)
471471

472472
ADD_DEFINITIONS(/TP ${FMU_MODELNAME}.c)
473473
set_source_files_properties(${OMC_OUTPUT} PROPERTIES LANGUAGE CXX)

0 commit comments

Comments
 (0)