Refine SimMock deployment paths.

Signed-off-by: Rule Timothy (CC/EMT2) <[email protected]>
boschglobal · Nov 29, 2023 · 5e1d360 · 5e1d360
1 parent 9352943
commit 5e1d360
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 11 deletions.
diff --git a/dse/modelc/mocks/CMakeLists.txt → dse/mocks/CMakeLists.txt b/dse/modelc/mocks/CMakeLists.txt → dse/mocks/CMakeLists.txt
@@ -24,5 +24,5 @@ target_include_directories(mocks
     PRIVATE
         ${DSE_CLIB_INCLUDE_DIR}
         ${DSE_NCODEC_INCLUDE_DIR}
-        ../../..
+        ../..
 )
diff --git a/dse/modelc/mocks/simmock.c → dse/mocks/simmock.c b/dse/modelc/mocks/simmock.c → dse/mocks/simmock.c
@@ -8,7 +8,7 @@
 #include <string.h>
 #include <dse/testing.h>
 #include <dse/ncodec/codec.h>
-#include <dse/modelc/mocks/simmock.h>
+#include <dse/mocks/simmock.h>
 
 
 /* Private interface from ncodec.c */

diff --git a/dse/modelc/mocks/simmock.h → dse/mocks/simmock.h b/dse/modelc/mocks/simmock.h → dse/mocks/simmock.h
@@ -2,8 +2,8 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-#ifndef DSE_MODELC_MOCKS_SIMMOCK_H_
-#define DSE_MODELC_MOCKS_SIMMOCK_H_
+#ifndef DSE_MOCKS_SIMMOCK_H_
+#define DSE_MOCKS_SIMMOCK_H_
 
 #include <stdbool.h>
 #include <dse/logger.h>
@@ -175,4 +175,4 @@ void simmock_print_scalar_signals(SimMock* mock, int level);
 void simmock_print_network_frames(SimMock* mock, int level);
 
 
-#endif  // DSE_MODELC_MOCKS_SIMMOCK_H_
+#endif  // DSE_MOCKS_SIMMOCK_H_
diff --git a/dse/modelc/CMakeLists.txt b/dse/modelc/CMakeLists.txt
@@ -184,6 +184,7 @@ endif()
 
 # Targets
 # =======
+set(DSE_MOCK_DIR ${CMAKE_SOURCE_DIR}/../mocks)
 set(DSE_MODELC_PUBLIC_HEADERS
     gateway.h
     mcl.h
@@ -194,7 +195,7 @@ add_subdirectory(adapter)
 add_subdirectory(controller)
 add_subdirectory(model)
 if(UNIX)
-add_subdirectory(mocks)
+add_subdirectory(${DSE_MOCK_DIR} ${CMAKE_CURRENT_BINARY_DIR}/mocks)
 endif()
 
 # Model C (static)
@@ -325,8 +326,15 @@ install(
 if(UNIX)
 install(
     FILES
-        mocks/simmock.c
-        mocks/simmock.h
+        ${DSE_MOCK_DIR}/simmock.h
+    DESTINATION
+        ${CMAKE_INSTALL_INCLUDEDIR}/dse/mocks
+    COMPONENT
+        modelc
+)
+install(
+    FILES
+        ${DSE_MOCK_DIR}/simmock.c
     DESTINATION
         mocks
     COMPONENT

diff --git a/dse/modelc/examples/apis/simmock_configure.c b/dse/modelc/examples/apis/simmock_configure.c
@@ -1,5 +1,5 @@
 #include <dse/testing.h>
-#include <dse/modelc/mocks/simmock.h>
+#include <dse/mocks/simmock.h>
 
 int test_setup(void** state)
 {

diff --git a/dse/modelc/examples/apis/simmock_frame_check.c b/dse/modelc/examples/apis/simmock_frame_check.c
@@ -1,5 +1,5 @@
 #include <dse/testing.h>
-#include <dse/modelc/mocks/simmock.h>
+#include <dse/mocks/simmock.h>
 
 void test_network__frame_check(void** state)
 {

diff --git a/dse/modelc/examples/apis/simmock_signal_check.c b/dse/modelc/examples/apis/simmock_signal_check.c
@@ -1,5 +1,5 @@
 #include <dse/testing.h>
-#include <dse/modelc/mocks/simmock.h>
+#include <dse/mocks/simmock.h>
 
 #define SIG_task_init_done  1
 #define SIG_task_5_active   2