diff options
author | Piotr Dziwinski <piotrdz@gmail.com> | 2013-01-04 00:05:28 +0100 |
---|---|---|
committer | Piotr Dziwinski <piotrdz@gmail.com> | 2013-01-04 00:05:28 +0100 |
commit | 89a3f586a224328b430ba2483ce5c12b33709c6a (patch) | |
tree | 691e1da1e297f7ea9045be5454747ca454680cb2 /lib/gtest/CMakeLists.txt | |
parent | c9335534d6bc7a59dbabf6976d41fd1e5edc8ab3 (diff) | |
parent | 1d42c71645548ae86b438c84898a07b539f262ac (diff) | |
download | colobot-89a3f586a224328b430ba2483ce5c12b33709c6a.tar.gz colobot-89a3f586a224328b430ba2483ce5c12b33709c6a.tar.bz2 colobot-89a3f586a224328b430ba2483ce5c12b33709c6a.zip |
Merge branch 'dev' into dev-graphics
Diffstat (limited to 'lib/gtest/CMakeLists.txt')
-rw-r--r-- | lib/gtest/CMakeLists.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/gtest/CMakeLists.txt b/lib/gtest/CMakeLists.txt index 61813ae..1279f7d 100644 --- a/lib/gtest/CMakeLists.txt +++ b/lib/gtest/CMakeLists.txt @@ -7,4 +7,3 @@ add_definitions(-DGTEST_HAS_PTHREAD=0) # gtest-all.cc includes all other sources add_library(gtest STATIC src/gtest-all.cc) -add_library(gmock STATIC src/gmock-all.cc) |