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
96824f11
Unverified
Commit
96824f11
authored
Oct 24, 2018
by
peter
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix -std=c++11 flag
parent
3bb00b7e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
1 deletion
+10
-1
CMakeLists.txt
CMakeLists.txt
+6
-1
internal_utils.cmake
googletest/cmake/internal_utils.cmake
+4
-0
No files found.
CMakeLists.txt
View file @
96824f11
cmake_minimum_required
(
VERSION 2.8.8
)
cmake_minimum_required
(
VERSION 2.8.8
)
add_definitions
(
-std=c++11
)
if
(
CMAKE_VERSION VERSION_LESS
"3.1"
)
add_definitions
(
-std=c++11
)
else
()
set
(
CMAKE_CXX_STANDARD 11
)
endif
()
if
(
POLICY CMP0048
)
if
(
POLICY CMP0048
)
cmake_policy
(
SET CMP0048 NEW
)
cmake_policy
(
SET CMP0048 NEW
)
...
...
googletest/cmake/internal_utils.cmake
View file @
96824f11
...
@@ -98,6 +98,10 @@ macro(config_compiler_and_linker)
...
@@ -98,6 +98,10 @@ macro(config_compiler_and_linker)
set
(
cxx_exception_flags
"-EHsc -D_HAS_EXCEPTIONS=1"
)
set
(
cxx_exception_flags
"-EHsc -D_HAS_EXCEPTIONS=1"
)
set
(
cxx_no_exception_flags
"-EHs-c- -D_HAS_EXCEPTIONS=0"
)
set
(
cxx_no_exception_flags
"-EHs-c- -D_HAS_EXCEPTIONS=0"
)
set
(
cxx_no_rtti_flags
"-GR-"
)
set
(
cxx_no_rtti_flags
"-GR-"
)
if
(
${
CMAKE_CXX_COMPILER_ID
}
STREQUAL
"Clang"
)
set
(
cxx_base_flags
"
${
cxx_base_flags
}
-Wno-unknown-argument"
)
endif
()
elseif
(
CMAKE_COMPILER_IS_GNUCXX
)
elseif
(
CMAKE_COMPILER_IS_GNUCXX
)
set
(
cxx_base_flags
"-Wall -Wshadow -Werror"
)
set
(
cxx_base_flags
"-Wall -Wshadow -Werror"
)
if
(
NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0.0
)
if
(
NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0.0
)
...
...
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