Skip to content

Commit d2d1d99

Browse files
committed
Fix CI build
1 parent f3ba03b commit d2d1d99

File tree

3 files changed

+2
-12
lines changed

3 files changed

+2
-12
lines changed

CMakeLists.txt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,7 @@ else ()
3131
# MSVC
3232

3333
if (NOT DEFINED MSVC_RUNTIME_TYPE)
34-
if (NOT WITH_TESTS)
35-
set (MSVC_RUNTIME_TYPE "/MD")
36-
else ()
37-
set (MSVC_RUNTIME_TYPE "/MT")
38-
endif ()
34+
set (MSVC_RUNTIME_TYPE "/MD")
3935
endif ()
4036
if (CMAKE_BUILD_TYPE MATCHES "Debug")
4137
set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${MSVC_RUNTIME_TYPE}d")

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: 0.5.'{build}'
1+
version: 0.5.{build}
22

33
os:
44
- Visual Studio 2015

thirdparty/CMakeLists.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,11 @@ list (APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../cmake)
66
include (build_thirdparty)
77

88
if (${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC")
9-
message (STATUS "######### <<<<<<<<< !!!!!!!!!!!!")
109
if (MSVC_RUNTIME_TYPE STREQUAL "/MD" OR NOT MSVC_RUNTIME_TYPE)
1110
set (GTEST_EXTRA_OPTIONS "-Dgtest_force_shared_crt=TRUE")
1211
else ()
1312
set (GTEST_EXTRA_OPTIONS "-Dgtest_force_shared_crt=TRUE")
1413
endif ()
15-
else ()
16-
message (STATUS "######### <<<<<<<<< ????????")
1714
endif ()
1815

19-
message (STATUS "#### CMAKE_CXX_COMPILER_ID: '${CMAKE_CXX_COMPILER_ID}'")
20-
message (STATUS "#### GTEST_EXTRA_OPTIONS: ${GTEST_EXTRA_OPTIONS}")
21-
2216
BuildThirdparty(gtest ${CMAKE_CURRENT_SOURCE_DIR}/gtest include/gmock/gmock.h "${GTEST_EXTRA_OPTIONS}")

0 commit comments

Comments
 (0)