#6661 Updated google tests to 1.8.1
This commit is contained in:
parent
a8d4ff58f1
commit
83d1588666
5 changed files with 13 additions and 9 deletions
3
.gitmodules
vendored
3
.gitmodules
vendored
|
|
@ -0,0 +1,3 @@
|
|||
[submodule "ext/googletest"]
|
||||
path = ext/googletest
|
||||
url = https://github.com/google/googletest.git
|
||||
|
|
@ -56,7 +56,7 @@ else()
|
|||
endif()
|
||||
|
||||
set (libs)
|
||||
include_directories (BEFORE SYSTEM ./ext/gtest/include)
|
||||
include_directories (BEFORE SYSTEM ./ext/googletest/googletest/include)
|
||||
|
||||
if (UNIX)
|
||||
if (NOT APPLE)
|
||||
|
|
|
|||
1
ext/googletest
Submodule
1
ext/googletest
Submodule
|
|
@ -0,0 +1 @@
|
|||
Subproject commit 2fe3bd994b3189899d93f1d5a881e725e046fdc2
|
||||
|
|
@ -15,13 +15,13 @@
|
|||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
include_directories(
|
||||
../../ext/gtest
|
||||
../../ext/gtest/include
|
||||
../../ext/gmock
|
||||
../../ext/gmock/include)
|
||||
../../ext/googletest/googletest
|
||||
../../ext/googletest/googletest/include
|
||||
../../ext/googletest/googlemock
|
||||
../../ext/googletest/googlemock/include)
|
||||
|
||||
add_library(gtest STATIC ../../ext/gtest/src/gtest-all.cc)
|
||||
add_library(gmock STATIC ../../ext/gmock/src/gmock-all.cc)
|
||||
add_library(gtest STATIC ../../ext/googletest/googletest/src/gtest-all.cc)
|
||||
add_library(gmock STATIC ../../ext/googletest/googlemock/src/gmock-all.cc)
|
||||
|
||||
if (UNIX)
|
||||
# ignore warnings in gtest and gmock
|
||||
|
|
|
|||
|
|
@ -56,8 +56,8 @@ endif()
|
|||
include_directories(
|
||||
../../
|
||||
../../lib/
|
||||
../../../ext/gtest/include
|
||||
../../../ext/gmock/include
|
||||
../../../ext/googletest/googletest/include
|
||||
../../../ext/googletest/googlemock/include
|
||||
)
|
||||
|
||||
if (UNIX)
|
||||
|
|
|
|||
Loading…
Reference in a new issue