Skip to content

T
TDengine

taosdata / TDengine
1 年多 前同步成功

通知 1185
Star 22017
Fork 4786
T
TDengine
未验证 提交 4e626d06 编写于 作者: wafwerar's avatar wafwerar 提交者： GitHub
浏览文件
操作

Merge pull request #14535 from taosdata/fix/ZhiqiangWang/TD-13063-fix-gtest-static-dynamic-error 

os: fix gtest static dynamic error
上级 6af95b3b d22a4139
隐藏空白更改
内联 并排
Showing with 2 addition and 1 deletion
contrib/CMakeLists.txt
浏览文件 @ 4e626d06
...@@ -118,6 +118,7 @@ execute_process(COMMAND "${CMAKE_COMMAND}" --build . ...@@ -118,6 +118,7 @@ execute_process(COMMAND "${CMAKE_COMMAND}" --build .
# ================================================================================================ # ================================================================================================
# googletest # googletest
if(${BUILD_TEST}) if(${BUILD_TEST})
set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
add_subdirectory(googletest EXCLUDE_FROM_ALL) add_subdirectory(googletest EXCLUDE_FROM_ALL)
target_include_directories( target_include_directories(
gtest gtest
...@@ -259,7 +260,7 @@ if(${BUILD_MSVCREGEX}) ...@@ -259,7 +260,7 @@ if(${BUILD_MSVCREGEX})
SET_TARGET_PROPERTIES(msvcregex PROPERTIES OUTPUT_NAME msvcregex) SET_TARGET_PROPERTIES(msvcregex PROPERTIES OUTPUT_NAME msvcregex)
endif(${BUILD_MSVCREGEX}) endif(${BUILD_MSVCREGEX})
# msvcregex # wcwidth
if(${BUILD_WCWIDTH}) if(${BUILD_WCWIDTH})
add_library(wcwidth STATIC "") add_library(wcwidth STATIC "")
target_sources(wcwidth target_sources(wcwidth
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或