From 0d31c388b9d3afe43f2aba9aface6de16d6a7cf4 Mon Sep 17 00:00:00 2001 From: ruanshudong Date: Thu, 21 Nov 2024 21:22:52 +0800 Subject: [PATCH] fix windows dll install --- servant/libservant/CMakeLists.txt | 1 + tools/tarsparse/CMakeLists.txt | 1 + util/src/CMakeLists.txt | 1 + util/src/tc_serialport.cpp | 2 +- 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/servant/libservant/CMakeLists.txt b/servant/libservant/CMakeLists.txt index db14d63e..8d05e3f1 100755 --- a/servant/libservant/CMakeLists.txt +++ b/servant/libservant/CMakeLists.txt @@ -26,6 +26,7 @@ if(ENABLE_SHARED) add_dependencies(tarsservant_shared tarsservant tarsutil_shared tarsparse_shared) install(TARGETS tarsservant_shared + RUNTIME DESTINATION lib LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) if (WIN32) diff --git a/tools/tarsparse/CMakeLists.txt b/tools/tarsparse/CMakeLists.txt index 167d8170..a12a3864 100644 --- a/tools/tarsparse/CMakeLists.txt +++ b/tools/tarsparse/CMakeLists.txt @@ -46,6 +46,7 @@ if(ENABLE_SHARED) target_link_libraries(${TARGETNAME}_shared tarsutil_shared) install(TARGETS ${TARGETNAME}_shared + RUNTIME DESTINATION lib LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) diff --git a/util/src/CMakeLists.txt b/util/src/CMakeLists.txt index f6cc731e..22d393a2 100644 --- a/util/src/CMakeLists.txt +++ b/util/src/CMakeLists.txt @@ -56,6 +56,7 @@ if(ENABLE_SHARED) add_dependencies(tarsutil_shared thirdparty) install(TARGETS tarsutil_shared + RUNTIME DESTINATION lib LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) if (WIN32) diff --git a/util/src/tc_serialport.cpp b/util/src/tc_serialport.cpp index a669a591..cc9bc3f3 100644 --- a/util/src/tc_serialport.cpp +++ b/util/src/tc_serialport.cpp @@ -715,7 +715,7 @@ void TC_SerialPort::recvSucc(uint32_t len) if((*it)->length() > 0) { - assert((*it)->length() == length); + assert((*it)->length() == len); _recvBuffer.addBuffer(*it); }