🔧 库文件版本号后缀只在 MSVC 下特化

cv-rmvl · Feb 4, 2025 · 60f990c · 60f990c
1 parent 2bdcf62
commit 60f990c
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 17 deletions.
diff --git a/cmake/RMVLCompilerOptions.cmake b/cmake/RMVLCompilerOptions.cmake
@@ -148,7 +148,7 @@ if(ENABLE_LTO)
   endif()
 endif()
 
-if(WIN32)
+if(RMVL_MSVC)
   # postfix of DLLs
   set(RMVL_LIBVERSION_SUFFIX "${RMVL_VERSION_MAJOR}${RMVL_VERSION_MINOR}${RMVL_VERSION_PATCH}" CACHE INTERNAL "RMVL library version suffix")
   set(RMVL_DEBUG_POSTFIX "d" CACHE INTERNAL "RMVL debug postfix")

diff --git a/cmake/RMVLModule.cmake b/cmake/RMVLModule.cmake
@@ -175,14 +175,12 @@ macro(rmvl_add_module _name)
           CACHE INTERNAL "Source files of RMVL modules"
         )
       else()
+        add_library(${the_module} ${target_src} ${para_src} ${extra_src})
         if(BUILD_SHARED_LIBS)
-          add_library(${the_module} SHARED ${target_src} ${para_src} ${extra_src})
           set_target_properties(
             ${the_module} PROPERTIES
             DEFINE_SYMBOL RMVLAPI_EXPORTS
           )
-        else()
-          add_library(${the_module} STATIC ${target_src} ${para_src} ${extra_src})
         endif()
       endif()
     endif(MD_INTERFACE)

diff --git a/doc/rmvl.bib b/doc/rmvl.bib
@@ -30,10 +30,12 @@ @article{kalman60
   year = {1960}
 }
 @software{microsoft23ort,
-  author = {microsoft},
-  title = {onnx runtime inference},
-  year = {2021},
-  url = {https://github.com/microsoft/onnxruntime}
+  author = {{ONNX Runtime developers}},
+  license = {MIT},
+  month = nov,
+  title = {{ONNX Runtime}},
+  url = {https://github.com/microsoft/onnxruntime},
+  year = {2018}
 }
 @software{AprilRobotics23,
   author = {AprilRobotics},
@@ -167,4 +169,4 @@ @article{Geman87
   volume  = {52},
   number  = {4},
   pages   = {5--21}
-}
+}
diff --git a/modules/algorithm/CMakeLists.txt b/modules/algorithm/CMakeLists.txt
@@ -3,11 +3,9 @@
 # ----------------------------------------------------------------------------
 rmvl_generate_para(algorithm)
 
+rmvl_add_module(algorithm DEPENDS core)
 if(WITH_OPENCV AND WITH_EIGEN3)
-  rmvl_add_module(algorithm DEPENDS core)
   rmvl_compile_definitions(algorithm PUBLIC HAVE_OPENCV)
-else()
-  rmvl_add_module(algorithm DEPENDS core)
 endif()
 
 # ----------------------------------------------------------------------------

diff --git a/modules/core/include/rmvl/core.hpp b/modules/core/include/rmvl/core.hpp
@@ -6,7 +6,7 @@
  * @date 2023-04-18
  *
  * @copyright Copyright 2023 (c), zhaoxi
- * 
+ *
  */
 
 #pragma once
@@ -42,6 +42,7 @@
 
 // 通用
 #include "core/io.hpp"
+#include "core/str.hpp"
 #include "core/timer.hpp"
 #include "core/util.hpp"
 #include "core/version.hpp"
diff --git a/modules/opcua/include/rmvl/opcua/client.hpp b/modules/opcua/include/rmvl/opcua/client.hpp
@@ -225,7 +225,7 @@ class RMVL_EXPORTS_W Client
      * 
      * @param[in] obj_nd 对象节点
      * @param[in] name 方法名
-     * @param[in] inputs 输入参数列表
+     * @param[in] args 方法的所有传入参数
      * @retval res, oargs
      * @return 是否成功完成当前操作，以及输出参数列表
      */
@@ -246,7 +246,7 @@ class RMVL_EXPORTS_W Client
      * @brief 直接以底层数据调用 ObjectsFolder 中的方法
      *
      * @param[in] name 方法名 `browse_name`
-     * @param[in] inputs 输入参数列表
+     * @param[in] args 方法的所有传入参数
      * @retval res, oargs
      * @return 是否成功完成当前操作，以及输出参数列表
      */

diff --git a/modules/opcua/include/rmvl/opcua/method.hpp b/modules/opcua/include/rmvl/opcua/method.hpp
@@ -41,7 +41,7 @@ struct RMVL_EXPORTS_W_AG Argument final
      * @param[in] desc 参数描述
      * @return 方法参数信息
      */
-    RMVL_W static Argument create(const std::string &name, DataType type, uint32_t dims = 1U, const std::string &desc = "") { return {name, type, dims, desc}; }
+    RMVL_W static Argument create(const std::string &name, DataType type, uint32_t dims = 1, const std::string &desc = "") { return {name, type, dims, desc}; }
 };
 
 /**

diff --git a/modules/opcua/include/rmvl/opcua/server.hpp b/modules/opcua/include/rmvl/opcua/server.hpp
@@ -12,7 +12,6 @@
 #pragma once
 
 #include <atomic>
-#include <unordered_set>
 
 #include "event.hpp"
 #include "object.hpp"