Skip to content

Commit 6119e7e

Browse files
kankriRisto KankkunenJustin Boswell
authored
Support STATIC_CRT setting like aws-c-* libraries do (aws#117)
Co-authored-by: Risto Kankkunen <[email protected]> Co-authored-by: Justin Boswell <[email protected]>
1 parent 915b6cd commit 6119e7e

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

CMakeLists.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,13 @@ set_target_properties(${PROJECT_NAME} PROPERTIES CXX_STANDARD ${CMAKE_CXX_STANDA
194194

195195
aws_prepare_symbol_visibility_args(${PROJECT_NAME} "AWS_CRT_CPP")
196196

197-
#set warnings
197+
#set warnings and runtime library
198198
if (MSVC)
199+
if(STATIC_CRT)
200+
target_compile_options(${PROJECT_NAME} PRIVATE "/MT$<$<CONFIG:Debug>:d>")
201+
else()
202+
target_compile_options(${PROJECT_NAME} PRIVATE "/MD$<$<CONFIG:Debug>:d>")
203+
endif()
199204
target_compile_options(${PROJECT_NAME} PRIVATE /W4 /WX /wd4068)
200205
else ()
201206
target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wno-long-long -pedantic -Werror)

bin/elasticurl_cpp/CMakeLists.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,13 @@ add_executable(${ELASTICURL_CPP_PROJECT_NAME} ${ELASTICURL_CPP_SRC})
1212
set_target_properties(${ELASTICURL_CPP_PROJECT_NAME} PROPERTIES LINKER_LANGUAGE CXX)
1313
set_target_properties(${ELASTICURL_CPP_PROJECT_NAME} PROPERTIES CXX_STANDARD ${CMAKE_CXX_STANDARD})
1414

15-
#set warnings
15+
#set warnings and runtime library
1616
if (MSVC)
17+
if(STATIC_CRT)
18+
target_compile_options(${PROJECT_NAME} PRIVATE "/MT$<$<CONFIG:Debug>:d>")
19+
else()
20+
target_compile_options(${PROJECT_NAME} PRIVATE "/MD$<$<CONFIG:Debug>:d>")
21+
endif()
1722
target_compile_options(${ELASTICURL_CPP_PROJECT_NAME} PRIVATE /W4 /WX)
1823
else ()
1924
target_compile_options(${ELASTICURL_CPP_PROJECT_NAME} PRIVATE -Wall -Wno-long-long -pedantic -Werror)

0 commit comments

Comments
 (0)