os: fix gtest static dynamic error
This commit is contained in:
parent
98f32c46e6
commit
d22a413913
|
@ -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})
|
||||||
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
|
||||||
|
|
Loading…
Reference in New Issue