Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
benchmark
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
benchmark
Commits
8356d646
Unverified
Commit
8356d646
authored
Oct 13, 2018
by
Eric
Committed by
GitHub
Oct 13, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Fix SOURCE_DIR in HandleGTest.cmake (#703)" (#704)
This reverts commit
60975230
.
parent
60975230
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
11 deletions
+4
-11
HandleGTest.cmake
cmake/HandleGTest.cmake
+4
-11
No files found.
cmake/HandleGTest.cmake
View file @
8356d646
...
@@ -75,10 +75,12 @@ macro(build_external_gtest)
...
@@ -75,10 +75,12 @@ macro(build_external_gtest)
endforeach
()
endforeach
()
endmacro
(
build_external_gtest
)
endmacro
(
build_external_gtest
)
macro
(
build_gtest_from_dir
)
if
(
BENCHMARK_ENABLE_GTEST_TESTS
)
if
(
IS_DIRECTORY
${
CMAKE_SOURCE_DIR
}
/googletest
)
set
(
GTEST_ROOT
"
${
CMAKE_SOURCE_DIR
}
/googletest"
)
set
(
INSTALL_GTEST OFF CACHE INTERNAL
""
)
set
(
INSTALL_GTEST OFF CACHE INTERNAL
""
)
set
(
INSTALL_GMOCK OFF CACHE INTERNAL
""
)
set
(
INSTALL_GMOCK OFF CACHE INTERNAL
""
)
add_subdirectory
(
${
GTEST_ROOT
}
build
)
add_subdirectory
(
${
CMAKE_SOURCE_DIR
}
/googletest
)
set
(
GTEST_BOTH_LIBRARIES gtest gmock gmock_main
)
set
(
GTEST_BOTH_LIBRARIES gtest gmock gmock_main
)
foreach
(
HEADER test mock
)
foreach
(
HEADER test mock
)
# CMake 2.8 and older don't respect INTERFACE_INCLUDE_DIRECTORIES, so we
# CMake 2.8 and older don't respect INTERFACE_INCLUDE_DIRECTORIES, so we
...
@@ -94,15 +96,6 @@ macro(build_gtest_from_dir)
...
@@ -94,15 +96,6 @@ macro(build_gtest_from_dir)
endif
()
endif
()
list
(
APPEND GTEST_INCLUDE_DIRS
${
HEADER_PATH_
${
HEADER
}}
)
list
(
APPEND GTEST_INCLUDE_DIRS
${
HEADER_PATH_
${
HEADER
}}
)
endforeach
()
endforeach
()
endmacro
()
if
(
BENCHMARK_ENABLE_GTEST_TESTS
)
if
(
IS_DIRECTORY
${
CMAKE_SOURCE_DIR
}
/googletest
)
set
(
GTEST_ROOT
"
${
CMAKE_SOURCE_DIR
}
/googletest"
)
build_gtest_from_dir
()
elseif
(
IS_DIRECTORY
${
CMAKE_CURRENT_SOURCE_DIR
}
/googletest
)
set
(
GTEST_ROOT
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/googletest"
)
build_gtest_from_dir
()
elseif
(
BENCHMARK_DOWNLOAD_DEPENDENCIES
)
elseif
(
BENCHMARK_DOWNLOAD_DEPENDENCIES
)
build_external_gtest
()
build_external_gtest
()
else
()
else
()
...
...
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