summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--common/CMakeLists.txt24
-rw-r--r--script/shaping_engine.service (renamed from script/sce.service)2
-rw-r--r--vendor/CMakeLists.txt24
3 files changed, 25 insertions, 25 deletions
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index 441ea8c..d41da76 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -4,29 +4,5 @@ target_link_libraries(common PUBLIC MESA_handle_logger)
#target_link_libraries(common PUBLIC mrzcpd)
target_include_directories(common PUBLIC ${CMAKE_CURRENT_LIST_DIR}/include)
-# MESA Framework
-set(MESA_FRAMEWORK_LIB_DIR /opt/MESA/lib)
-set(MESA_FRAMEWORK_INCLUDE_DIR /opt/MESA/include)
-
-add_library(MESA_handle_logger SHARED IMPORTED GLOBAL)
-set_property(TARGET MESA_handle_logger PROPERTY IMPORTED_LOCATION ${MESA_FRAMEWORK_LIB_DIR}/libMESA_handle_logger.so)
-set_property(TARGET MESA_handle_logger PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${MESA_FRAMEWORK_INCLUDE_DIR})
-
-add_library(MESA_prof_load SHARED IMPORTED GLOBAL)
-set_property(TARGET MESA_prof_load PROPERTY IMPORTED_LOCATION ${MESA_FRAMEWORK_LIB_DIR}/libMESA_prof_load.so)
-set_property(TARGET MESA_prof_load PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${MESA_FRAMEWORK_INCLUDE_DIR})
-
-set(MRZCPD_LIB_DIR /opt/mrzcpd/lib)
-set(MRZCPD_INCLUDE_DIR /opt/mrzcpd/include)
-
-add_library(mrzcpd SHARED IMPORTED GLOBAL)
-set_property(TARGET mrzcpd PROPERTY IMPORTED_LOCATION ${MRZCPD_LIB_DIR}/libmarsio.so)
-set_property(TARGET mrzcpd PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${MRZCPD_INCLUDE_DIR})
-
-add_library(breakpad_mini SHARED IMPORTED GLOBAL)
-set_property(TARGET breakpad_mini PROPERTY IMPORTED_LOCATION ${MESA_FRAMEWORK_LIB_DIR}/libbreakpad_mini.so)
-set_property(TARGET breakpad_mini PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${MESA_FRAMEWORK_INCLUDE_DIR})
-
-
add_subdirectory(libavl)
add_subdirectory(test) \ No newline at end of file
diff --git a/script/sce.service b/script/shaping_engine.service
index 6f8543e..b1aa658 100644
--- a/script/sce.service
+++ b/script/shaping_engine.service
@@ -4,4 +4,4 @@ After=network.target
[Service]
WorkingDirectory=/opt/tsg/shaping_engine/
-ExecStart=/opt/tsg/sce/bin/shaping_engine \ No newline at end of file
+ExecStart=/opt/tsg/shaping_engine/bin/shaping_engine \ No newline at end of file
diff --git a/vendor/CMakeLists.txt b/vendor/CMakeLists.txt
index e10f3d2..a7c0f0b 100644
--- a/vendor/CMakeLists.txt
+++ b/vendor/CMakeLists.txt
@@ -35,3 +35,27 @@ add_library(cjson SHARED IMPORTED GLOBAL)
add_dependencies(cjson cJSON)
set_property(TARGET cjson PROPERTY IMPORTED_LOCATION ${INSTALL_DIR}/lib64/libcjson.a)
set_property(TARGET cjson PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include)
+
+
+# MESA Framework
+set(MESA_FRAMEWORK_LIB_DIR /opt/MESA/lib)
+set(MESA_FRAMEWORK_INCLUDE_DIR /opt/MESA/include)
+
+add_library(MESA_handle_logger SHARED IMPORTED GLOBAL)
+set_property(TARGET MESA_handle_logger PROPERTY IMPORTED_LOCATION ${MESA_FRAMEWORK_LIB_DIR}/libMESA_handle_logger.so)
+set_property(TARGET MESA_handle_logger PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${MESA_FRAMEWORK_INCLUDE_DIR})
+
+add_library(MESA_prof_load SHARED IMPORTED GLOBAL)
+set_property(TARGET MESA_prof_load PROPERTY IMPORTED_LOCATION ${MESA_FRAMEWORK_LIB_DIR}/libMESA_prof_load.so)
+set_property(TARGET MESA_prof_load PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${MESA_FRAMEWORK_INCLUDE_DIR})
+
+set(MRZCPD_LIB_DIR /opt/mrzcpd/lib)
+set(MRZCPD_INCLUDE_DIR /opt/mrzcpd/include)
+
+add_library(mrzcpd SHARED IMPORTED GLOBAL)
+set_property(TARGET mrzcpd PROPERTY IMPORTED_LOCATION ${MRZCPD_LIB_DIR}/libmarsio.so)
+set_property(TARGET mrzcpd PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${MRZCPD_INCLUDE_DIR})
+
+add_library(breakpad_mini SHARED IMPORTED GLOBAL)
+set_property(TARGET breakpad_mini PROPERTY IMPORTED_LOCATION ${MESA_FRAMEWORK_LIB_DIR}/libbreakpad_mini.so)
+set_property(TARGET breakpad_mini PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${MESA_FRAMEWORK_INCLUDE_DIR}) \ No newline at end of file