Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
F
fmt
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
fmt
Commits
223a0fa5
Commit
223a0fa5
authored
Dec 13, 2021
by
Alexey Ochapov
Committed by
Victor Zverovich
Dec 17, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
move gtest-specific check into gtest/CMakeLists.txt
parent
ef72b471
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
test/CMakeLists.txt
test/CMakeLists.txt
+0
-7
test/gtest/CMakeLists.txt
test/gtest/CMakeLists.txt
+7
-0
No files found.
test/CMakeLists.txt
View file @
223a0fa5
...
...
@@ -8,13 +8,6 @@ target_link_libraries(test-main gtest)
include
(
CheckCXXCompilerFlag
)
# Workaround GTest bug https://github.com/google/googletest/issues/705.
check_cxx_compiler_flag
(
-fno-delete-null-pointer-checks HAVE_FNO_DELETE_NULL_POINTER_CHECKS
)
if
(
HAVE_FNO_DELETE_NULL_POINTER_CHECKS
)
target_compile_options
(
test-main PUBLIC -fno-delete-null-pointer-checks
)
endif
()
# Use less strict pedantic flags for the tests because GMock doesn't compile
# cleanly with -pedantic and -std=c++98.
if
(
CMAKE_COMPILER_IS_GNUCXX
OR
(
CMAKE_CXX_COMPILER_ID MATCHES
"Clang"
))
...
...
test/gtest/CMakeLists.txt
View file @
223a0fa5
...
...
@@ -17,6 +17,13 @@ else ()
target_compile_definitions
(
gtest PUBLIC GTEST_HAS_PTHREAD=0
)
endif
()
# Workaround GTest bug https://github.com/google/googletest/issues/705.
check_cxx_compiler_flag
(
-fno-delete-null-pointer-checks HAVE_FNO_DELETE_NULL_POINTER_CHECKS
)
if
(
HAVE_FNO_DELETE_NULL_POINTER_CHECKS
)
target_compile_options
(
gtest PUBLIC -fno-delete-null-pointer-checks
)
endif
()
if
(
MSVC
)
# Disable MSVC warnings of _CRT_INSECURE_DEPRECATE functions.
target_compile_definitions
(
gtest PRIVATE _CRT_SECURE_NO_WARNINGS
)
...
...
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