Skip to content

Commit d25cfab

Browse files
完善插件信息
1 parent bb4c129 commit d25cfab

File tree

2 files changed

+7
-12
lines changed

2 files changed

+7
-12
lines changed

CMakeLists.txt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,13 @@ set (CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR})
1414
set (CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH})
1515
set (CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
1616

17+
# 设置静态库文件目录
18+
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/lib)
19+
# 动态库文件目录
20+
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin/plugins)
21+
# 可执行文件目录
22+
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin)
23+
1724
message(STATUS ${CPACK_PACKAGE_VERSION})
1825

1926

@@ -22,9 +29,6 @@ add_subdirectory(3rd/glog)
2229
add_subdirectory(plugins)
2330

2431

25-
26-
27-
2832
add_executable(dlms
2933
src/dlms/dlms.cpp
3034
src/dlms/plugin_manager.cpp

plugins/CMakeLists.txt

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,5 @@
11

22

3-
# 设置静态库文件目录
4-
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/lib)
5-
# 动态库文件目录
6-
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin/plugins)
7-
# 可执行文件目录
8-
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin)
9-
10-
11-
123
add_library(websocket SHARED
134
websocket/websocket_plugin.cpp
145
websocket/websocket_server.cpp

0 commit comments

Comments
 (0)