Skip to content
This repository was archived by the owner on Jan 7, 2020. It is now read-only.

Commit 5bdc9e4

Browse files
committed
Fix crt
1 parent 7fa355a commit 5bdc9e4

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

.appveyor.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ configuration:
1515
environment:
1616
VCPKG_ROOT: C:\tools\vcpkg
1717

18-
cache: c:\tools\vcpkg\installed\ -> .appveyor.yml # cache the installed vcpkg packages
19-
2018
install:
2119
- git submodule init
2220
- git submodule update

CMakeLists.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ set(CMAKE_CXX_FLAGS "/MP ${CMAKE_CXX_FLAGS}") # build with object level paralle
88
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
99

1010
include(cotire)
11+
include(UseStaticCRT)
1112
include(FindVcpkgIncludeDir)
1213

1314
if(CMAKE_BUILD_TYPE MATCHES "^Debug$")
@@ -21,12 +22,10 @@ include_directories(src)
2122
add_definitions(-DBOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE
2223
-D_WIN32_WINNT=0x0501
2324
-DWIN32_LEAN_AND_MEAN
24-
-DNOMINMAX)
25+
-DNOMINMAX)
2526

2627
find_package(Iconv REQUIRED)
2728

28-
include(FixLinkConflict)
29-
3029
file(GLOB_RECURSE SOURCE_FILES src/*.cpp)
3130
set(LIB_NAME "com.example.demo")
3231
add_library(${LIB_NAME} SHARED ${SOURCE_FILES})

0 commit comments

Comments
 (0)