File tree Expand file tree Collapse file tree 3 files changed +2
-12
lines changed Expand file tree Collapse file tree 3 files changed +2
-12
lines changed Original file line number Diff line number Diff line change @@ -31,11 +31,7 @@ else ()
31
31
# MSVC
32
32
33
33
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" )
39
35
endif ()
40
36
if (CMAKE_BUILD_TYPE MATCHES "Debug" )
41
37
set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${MSVC_RUNTIME_TYPE} d" )
Original file line number Diff line number Diff line change 1
- version : 0.5.' {build}'
1
+ version : 0.5.{build}
2
2
3
3
os :
4
4
- Visual Studio 2015
Original file line number Diff line number Diff line change @@ -6,17 +6,11 @@ list (APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../cmake)
6
6
include (build_thirdparty )
7
7
8
8
if (${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC" )
9
- message (STATUS "######### <<<<<<<<< !!!!!!!!!!!!" )
10
9
if (MSVC_RUNTIME_TYPE STREQUAL "/MD" OR NOT MSVC_RUNTIME_TYPE )
11
10
set (GTEST_EXTRA_OPTIONS "-Dgtest_force_shared_crt=TRUE" )
12
11
else ()
13
12
set (GTEST_EXTRA_OPTIONS "-Dgtest_force_shared_crt=TRUE" )
14
13
endif ()
15
- else ()
16
- message (STATUS "######### <<<<<<<<< ????????" )
17
14
endif ()
18
15
19
- message (STATUS "#### CMAKE_CXX_COMPILER_ID: '${CMAKE_CXX_COMPILER_ID} '" )
20
- message (STATUS "#### GTEST_EXTRA_OPTIONS: ${GTEST_EXTRA_OPTIONS} " )
21
-
22
16
BuildThirdparty (gtest ${CMAKE_CURRENT_SOURCE_DIR} /gtest include /gmock/gmock.h "${GTEST_EXTRA_OPTIONS} " )
You can’t perform that action at this time.
0 commit comments