Skip to content

Commit

Permalink
Merge branch 'development' into feature/mpi-pf
Browse files Browse the repository at this point in the history
  • Loading branch information
Matthew Emmett committed Jul 31, 2014
2 parents ca1d7b7 + 5336070 commit ae2bca1
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions 3rdparty/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,9 @@ if(pfasst_BUILD_TESTS)
# Add gmock
ExternalProject_Add(
googlemock
SVN_REPOSITORY http://googlemock.googlecode.com/svn/trunk/
SVN_REVISION -r 449 # release 1.7.0
TIMEOUT 10
# Disable SVN update
URL http://googlemock.googlecode.com/files/gmock-1.7.0.zip
URL_MD5 073b984d8798ea1594f5e44d85b20d66
TIMEOUT 30
UPDATE_COMMAND ""
PATCH_COMMAND ""
CMAKE_ARGS -DCMAKE_BUILD_TYPE=Release
Expand Down

0 comments on commit ae2bca1

Please sign in to comment.