Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use googletest master branch. #50

Merged
merged 1 commit into from
Dec 1, 2015
Merged

Use googletest master branch. #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@ init:

# scripts that run after cloning repository
install:
- git clone -b release-1.7.0 https://github.com/google/googlemock.git third_party/gmock-1.7.0
- git clone -b release-1.7.0 https://github.com/google/googletest.git third_party/gmock-1.7.0/gtest
- git clone https://github.com/google/googletest.git third_party/googletest
- git clone https://github.com/google/glslang third_party/glslang

build:
Expand Down
3 changes: 1 addition & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,7 @@ install:
- if [ "$CC" = "clang" ]; then export CC=clang-3.6 CXX=clang++-3.6; fi # Make sure that clang-3.6 is selected.

before_script:
- git clone -b release-1.7.0 https://github.com/google/googlemock.git third_party/gmock-1.7.0
- git clone -b release-1.7.0 https://github.com/google/googletest.git third_party/gmock-1.7.0/gtest
- git clone https://github.com/google/googletest.git third_party/googletest
- git clone https://github.com/google/glslang.git third_party/glslang

script:
Expand Down
4 changes: 1 addition & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,7 @@ Shaderc into.
```sh
git clone https://github.com/google/shaderc $SOURCE_DIR
cd $SOURCE_DIR/third_party
git clone -b release-1.7.0 https://github.com/google/googlemock.git gmock-1.7.0
git clone -b release-1.7.0 https://github.com/google/googletest.git \
gmock-1.7.0/gtest
git clone https://github.com/google/googletest.git
git clone https://github.com/google/glslang glslang
cd $SOURCE_DIR/
```
Expand Down
4 changes: 2 additions & 2 deletions third_party/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Suppress all warnings from third-party projects.
set_property(DIRECTORY APPEND PROPERTY COMPILE_OPTIONS -w)

if (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/gmock-1.7.0)
add_subdirectory(gmock-1.7.0)
if (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/googletest)
add_subdirectory(googletest)
endif()
if (NOT TARGET gmock)
message(FATAL_ERROR "gmock was not found - required for tests")
Expand Down