FMU: produce FMU library files without lib prefix.

Signed-off-by: Timothy Rule (VM/EMT3) <[email protected]>
boschglobal · Dec 18, 2024 · 6f916e4 · 6f916e4
1 parent 5b1dc66
commit 6f916e4
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 4 deletions.
diff --git a/dse/examples/fmu/counter/CMakeLists.txt b/dse/examples/fmu/counter/CMakeLists.txt
@@ -96,6 +96,10 @@ target_link_libraries(fmu2${MODULE_LC}
         $<$<BOOL:${WIN32}>:dl>
         m
 )
+set_target_properties(fmu2${MODULE_LC}
+    PROPERTIES
+        PREFIX ""
+)
 install(
     TARGETS
         fmu2${MODULE_LC}
@@ -131,6 +135,10 @@ target_link_libraries(fmu3${MODULE_LC}
         $<$<BOOL:${WIN32}>:dl>
         m
 )
+set_target_properties(fmu3${MODULE_LC}
+    PROPERTIES
+        PREFIX ""
+)
 install(
     TARGETS
         fmu3${MODULE_LC}

diff --git a/dse/examples/fmu/linear/CMakeLists.txt b/dse/examples/fmu/linear/CMakeLists.txt
@@ -96,6 +96,10 @@ target_link_libraries(fmu2${MODULE_LC}
         $<$<BOOL:${WIN32}>:dl>
         m
 )
+set_target_properties(fmu2${MODULE_LC}
+    PROPERTIES
+        PREFIX ""
+)
 install(
     TARGETS
         fmu2${MODULE_LC}
@@ -131,6 +135,10 @@ target_link_libraries(fmu3${MODULE_LC}
         $<$<BOOL:${WIN32}>:dl>
         m
 )
+set_target_properties(fmu3${MODULE_LC}
+    PROPERTIES
+        PREFIX ""
+)
 install(
     TARGETS
         fmu3${MODULE_LC}

diff --git a/dse/fmu/CMakeLists.txt b/dse/fmu/CMakeLists.txt
@@ -83,6 +83,10 @@ target_link_libraries(fmi2fmu
         $<$<BOOL:${WIN32}>:dl>
         m
 )
+set_target_properties(fmi2fmu
+    PROPERTIES
+        PREFIX ""
+)
 install(
     TARGETS
         fmi2fmu

diff --git a/tests/testscript/e2e/example_fmu_counter.txtar b/tests/testscript/e2e/example_fmu_counter.txtar
@@ -2,12 +2,12 @@
 env NAME=counter
 env IMPORTER=dse/build/_out/importer/fmuImporter
 env FMU_DIR=dse/build/_out/examples/fmu/counter/fmi2
-env FMU_SO=binaries/linux64/libfmu2counter.so
+env FMU_SO=binaries/linux64/fmu2counter.so
 
 # TEST: FMU 2 Counter
 exec sh -e $WORK/test.sh
 
-stdout 'Importer: Loading FMU: binaries/linux64/libfmu2counter.so'
+stdout 'Importer: Loading FMU: binaries/linux64/fmu2counter.so'
 stdout 'Importer: Calling fmi2DoStep\(\): model_time=0.004500, step_size=0.000500'
 stdout 'Importer:   \[1\] 10.000000'
 

diff --git a/tests/testscript/e2e/example_fmu_linear.txtar b/tests/testscript/e2e/example_fmu_linear.txtar
@@ -2,12 +2,12 @@
 env NAME=linear
 env IMPORTER=dse/build/_out/importer/fmuImporter
 env FMU_DIR=dse/build/_out/examples/fmu/linear/fmi2
-env FMU_SO=binaries/linux64/libfmu2linear.so
+env FMU_SO=binaries/linux64/fmu2linear.so
 
 # TEST: FMU 2 Linear
 exec sh -e $WORK/test.sh
 
-stdout 'Importer: Loading FMU: binaries/linux64/libfmu2linear.so'
+stdout 'Importer: Loading FMU: binaries/linux64/fmu2linear.so'
 stdout 'Importer: Calling fmi2DoStep\(\): model_time=0.004500, step_size=0.000500'
 stdout 'Importer:   \[4\] 0.000000'