Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Feb 4, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmake/RMVLCompilerOptions.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 1 addition & 3 deletions cmake/RMVLModule.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
12 changes: 7 additions & 5 deletions doc/rmvl.bib
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down Expand Up @@ -167,4 +169,4 @@ @article{Geman87
volume = {52},
number = {4},
pages = {5--21}
}
}
4 changes: 1 addition & 3 deletions modules/algorithm/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()

# ----------------------------------------------------------------------------
Expand Down
3 changes: 2 additions & 1 deletion modules/core/include/rmvl/core.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* @date 2023-04-18
*
* @copyright Copyright 2023 (c), zhaoxi
*
*
*/

#pragma once
Expand Down Expand Up @@ -42,6 +42,7 @@

// 通用
#include "core/io.hpp"
#include "core/str.hpp"
#include "core/timer.hpp"
#include "core/util.hpp"
#include "core/version.hpp"
4 changes: 2 additions & 2 deletions modules/opcua/include/rmvl/opcua/client.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 是否成功完成当前操作,以及输出参数列表
*/
Expand All @@ -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 是否成功完成当前操作,以及输出参数列表
*/
Expand Down
2 changes: 1 addition & 1 deletion modules/opcua/include/rmvl/opcua/method.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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}; }
};

/**
Expand Down
1 change: 0 additions & 1 deletion modules/opcua/include/rmvl/opcua/server.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#pragma once

#include <atomic>
#include <unordered_set>

#include "event.hpp"
#include "object.hpp"
Expand Down