smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#6661 Updated google tests to 1.8.1

Browse source
This commit is contained in:
Jamie Newbon 2020-07-01 14:12:44 +01:00
parent a8d4ff58f1
commit 83d1588666
5 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -0,0 +1,3 @@
[submodule "ext/googletest"]
path = ext/googletest
url = https://github.com/google/googletest.git

2
CMakeLists.txt
View file

@ -56,7 +56,7 @@ else()
endif() endif()
set (libs) set (libs)
include_directories (BEFORE SYSTEM ./ext/gtest/include) include_directories (BEFORE SYSTEM ./ext/googletest/googletest/include)
if (UNIX) if (UNIX)
if (NOT APPLE) if (NOT APPLE)

1
ext/googletest Submodule

@ -0,0 +1 @@
Subproject commit 2fe3bd994b3189899d93f1d5a881e725e046fdc2

12
src/test/CMakeLists.txt
View file

@ -15,13 +15,13 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
include_directories( include_directories(
../../ext/gtest ../../ext/googletest/googletest
../../ext/gtest/include ../../ext/googletest/googletest/include
../../ext/gmock ../../ext/googletest/googlemock
../../ext/gmock/include) ../../ext/googletest/googlemock/include)
add_library(gtest STATIC ../../ext/gtest/src/gtest-all.cc) add_library(gtest STATIC ../../ext/googletest/googletest/src/gtest-all.cc)
add_library(gmock STATIC ../../ext/gmock/src/gmock-all.cc) add_library(gmock STATIC ../../ext/googletest/googlemock/src/gmock-all.cc)
if (UNIX) if (UNIX)
# ignore warnings in gtest and gmock # ignore warnings in gtest and gmock

4
src/test/integtests/CMakeLists.txt
View file

@ -56,8 +56,8 @@ endif()
include_directories( include_directories(
../../ ../../
../../lib/ ../../lib/
../../../ext/gtest/include ../../../ext/googletest/googletest/include
../../../ext/gmock/include ../../../ext/googletest/googlemock/include
) )
if (UNIX) if (UNIX)