Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
googletest
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
googletest
Commits
b68ec344
Commit
b68ec344
authored
Feb 12, 2019
by
Gennadiy Civil
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2101 from MaEtUgR:fix-cmake-cygwin
PiperOrigin-RevId: 233096223
parents
4f79e316
f8925343
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
9 deletions
+11
-9
CMakeLists.txt
CMakeLists.txt
+6
-4
README.md
README.md
+0
-1
advanced.md
googletest/docs/advanced.md
+5
-4
No files found.
CMakeLists.txt
View file @
b68ec344
cmake_minimum_required
(
VERSION 2.8.8
)
project
(
googletest-distribution
)
set
(
GOOGLETEST_VERSION 1.9.0
)
if
(
CMAKE_VERSION VERSION_LESS
"3.1"
)
add_definitions
(
-std=c++11
)
else
()
set
(
CMAKE_CXX_STANDARD 11
)
set
(
CMAKE_CXX_STANDARD_REQUIRED ON
)
set
(
CMAKE_CXX_EXTENSIONS OFF
)
if
(
NOT CYGWIN
)
set
(
CMAKE_CXX_EXTENSIONS OFF
)
endif
()
endif
()
if
(
POLICY CMP0048
)
cmake_policy
(
SET CMP0048 NEW
)
endif
(
POLICY CMP0048
)
project
(
googletest-distribution
)
set
(
GOOGLETEST_VERSION 1.9.0
)
enable_testing
()
include
(
CMakeDependentOption
)
...
...
README.md
View file @
b68ec344
...
...
@@ -56,7 +56,6 @@ Google test has been used on a variety of platforms:
*
MinGW
*
Windows Mobile
*
Symbian
*
PlatformIO
## Who Is Using Google Test? ##
...
...
googletest/docs/advanced.md
View file @
b68ec344
...
...
@@ -2430,7 +2430,7 @@ could generate this report:
"failures"
:
1
,
"errors"
:
0
,
"time"
:
"0.035s"
,
"timestamp"
:
"2011-10-31T18:52:42Z"
,
"timestamp"
:
"2011-10-31T18:52:42Z"
"name"
:
"AllTests"
,
"testsuites"
:
[
{
...
...
@@ -2447,11 +2447,11 @@ could generate this report:
"classname"
:
""
,
"failures"
:
[
{
"message"
:
"Value of: add(1, 1)
\
n
Actual: 3
\n
Expected: 2"
,
"message"
:
"Value of: add(1, 1)
\
x
0A Actual: 3
\x
0A
Expected: 2"
,
"type"
:
""
},
{
"message"
:
"Value of: add(1, -1)
\
n
Actual: 1
\n
Expected: 0"
,
"message"
:
"Value of: add(1, -1)
\
x
0A Actual: 1
\x
0A
Expected: 0"
,
"type"
:
""
}
]
...
...
@@ -2463,7 +2463,7 @@ could generate this report:
"classname"
:
""
}
]
}
,
}
{
"name"
:
"LogicTest"
,
"tests"
:
1
,
...
...
@@ -2517,3 +2517,4 @@ environment variable to `0`, or use the `--gtest_catch_exceptions=0` flag when
running the tests.
**Availability**
: Linux, Windows, Mac.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment