diff --git a/dse/fmimcl/examples/fmi2fmu/CMakeLists.txt b/dse/fmimcl/examples/fmi2fmu/CMakeLists.txt index bc69195..2abc784 100644 --- a/dse/fmimcl/examples/fmi2fmu/CMakeLists.txt +++ b/dse/fmimcl/examples/fmi2fmu/CMakeLists.txt @@ -13,27 +13,27 @@ set(FMI2_INCLUDE_DIR "${DSE_CLIB_SOURCE_DIR}/clib/fmi/fmi2/headers") # Targets # ======= -add_library(fmi2mclTarget SHARED +add_library(mclfmi2fmu SHARED fmi2fmu.c ../../../fmimodelc/ascii85.c ${DSE_CLIB_SOURCE_DIR}/clib/collections/hashmap.c ${DSE_CLIB_SOURCE_DIR}/clib/collections/set.c ) -target_include_directories(fmi2mclTarget +target_include_directories(mclfmi2fmu PRIVATE ${DSE_CLIB_INCLUDE_DIR} ${FMI2_INCLUDE_DIR} ) install( TARGETS - fmi2mclTarget + mclfmi2fmu LIBRARY DESTINATION ${MODEL_PATH}/lib ) install( TARGETS - fmi2mclTarget + mclfmi2fmu LIBRARY DESTINATION ${MODEL_PATH}/fmu/binaries/linux64 ) diff --git a/dse/fmimcl/examples/fmi2fmu/modelDescription.xml b/dse/fmimcl/examples/fmi2fmu/modelDescription.xml index bbfe68c..53c1afe 100644 --- a/dse/fmimcl/examples/fmi2fmu/modelDescription.xml +++ b/dse/fmimcl/examples/fmi2fmu/modelDescription.xml @@ -9,7 +9,7 @@ generationDateAndTime="" variableNamingConvention="" numberOfEventIndicators=""> - diff --git a/dse/fmimcl/examples/input/data/model.yaml b/dse/fmimcl/examples/input/data/model.yaml index d0e3f00..1604746 100644 --- a/dse/fmimcl/examples/input/data/model.yaml +++ b/dse/fmimcl/examples/input/data/model.yaml @@ -23,7 +23,7 @@ spec: mcl: - os: linux arch: amd64 - path: examples/lib/libfmi2fmu.so + path: examples/lib/libmclfmi2fmu.so channels: - alias: signal_channel selectors: diff --git a/tests/cmocka/fmimcl/mstep/fmu_mstep.yaml b/tests/cmocka/fmimcl/mstep/fmu_mstep.yaml index 585a7c6..023722a 100644 --- a/tests/cmocka/fmimcl/mstep/fmu_mstep.yaml +++ b/tests/cmocka/fmimcl/mstep/fmu_mstep.yaml @@ -45,7 +45,7 @@ spec: mcl: - os: linux arch: amd64 - path: ../../../../dse/build/_out/fmimcl/examples/lib/libfmi2mclTarget.so + path: ../../../../dse/build/_out/fmimcl/examples/lib/libmclfmi2fmu.so channels: - alias: signal_channel selectors: diff --git a/tests/cmocka/fmimcl/test_fmi2.c b/tests/cmocka/fmimcl/test_fmi2.c index bbc63a7..1178333 100644 --- a/tests/cmocka/fmimcl/test_fmi2.c +++ b/tests/cmocka/fmimcl/test_fmi2.c @@ -33,7 +33,7 @@ int test_fmi2_setup(void** state) .cosim = true, .guid = "", .resource_dir = "", - .path = "../../../../dse/build/_out/fmimcl/examples/lib/libfmi2mclTarget.so", + .path = "../../../../dse/build/_out/fmimcl/examples/lib/libmclfmi2fmu.so", .handle = "", }, .model_instance = {