mirror of
https://github.com/sogou/workflow.git
synced 2026-10-24 16:33:15 +08:00
Merge pull request #979 from luciouskami/windows
[fix] fix runtime error
This commit is contained in:
+1
-1
@@ -60,7 +60,7 @@ foreach(header_file ${INCLUDE_HEADERS} ${INCLUDE_KERNEL_HEADERS})
|
||||
endforeach()
|
||||
|
||||
if (WIN32)
|
||||
if (SRPC_TUTORIAL_BUILD_STATIC_RUNTIME)
|
||||
if (WORKFLOW_BUILD_STATIC_RUNTIME)
|
||||
set(CompilerFlags
|
||||
CMAKE_CXX_FLAGS
|
||||
CMAKE_CXX_FLAGS_DEBUG
|
||||
|
||||
@@ -6,6 +6,10 @@ project(tutorial
|
||||
LANGUAGES C CXX
|
||||
)
|
||||
|
||||
if (WIN32)
|
||||
option(WORKFLOW_TUTORIAL_BUILD_STATIC_RUNTIME "Use static runtime" ON)
|
||||
endif ()
|
||||
|
||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR})
|
||||
|
||||
find_library(LIBRT rt)
|
||||
@@ -14,6 +18,24 @@ find_package(workflow REQUIRED CONFIG HINTS ..)
|
||||
include_directories(${OPENSSL_INCLUDE_DIR} ${WORKFLOW_INCLUDE_DIR})
|
||||
link_directories(${WORKFLOW_LIB_DIR})
|
||||
|
||||
if (WIN32)
|
||||
if (WORKFLOW_TUTORIAL_BUILD_STATIC_RUNTIME)
|
||||
set(CompilerFlags
|
||||
CMAKE_CXX_FLAGS
|
||||
CMAKE_CXX_FLAGS_DEBUG
|
||||
CMAKE_CXX_FLAGS_RELEASE
|
||||
CMAKE_CXX_FLAGS_MINSIZEREL
|
||||
CMAKE_C_FLAGS
|
||||
CMAKE_C_FLAGS_DEBUG
|
||||
CMAKE_C_FLAGS_RELEASE
|
||||
CMAKE_C_FLAGS_MINSIZEREL
|
||||
)
|
||||
foreach(CompilerFlag ${CompilerFlags})
|
||||
string(REPLACE "/MD" "/MT" ${CompilerFlag} "${${CompilerFlag}}")
|
||||
endforeach ()
|
||||
endif ()
|
||||
endif ()
|
||||
|
||||
if (WIN32)
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /MP /wd4200")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /wd4200 /Zc:__cplusplus /std:c++14")
|
||||
|
||||
Reference in New Issue
Block a user