diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2013-10-24 21:32:18 +0200 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2013-10-24 21:37:07 +0200 |
| commit | 8d62da0c99133ab5e28b2e4120f2f70262a7709b (patch) | |
| tree | 38e97ddf137fe5faf53fe896544d37d7d5b7581d /lib | |
| parent | 97baf7242e49dd09d67b5c94441f983d61eaaeb3 (diff) | |
| download | colobot-8d62da0c99133ab5e28b2e4120f2f70262a7709b.tar.gz colobot-8d62da0c99133ab5e28b2e4120f2f70262a7709b.tar.bz2 colobot-8d62da0c99133ab5e28b2e4120f2f70262a7709b.zip | |
Added option to force to use bundled gmock/gtest
* resolves problem when version of gmock/gtest found installed in system
disagrees with the bundled one
* removed -DGTEST_HAVE_PTHREAD=0, seems that pthread is needed after all
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gtest/CMakeLists.txt | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/lib/gtest/CMakeLists.txt b/lib/gtest/CMakeLists.txt index 1279f7d..316ea14 100644 --- a/lib/gtest/CMakeLists.txt +++ b/lib/gtest/CMakeLists.txt @@ -2,8 +2,5 @@ cmake_minimum_required(VERSION 2.8) include_directories(. include) -# pthread is not necessary -add_definitions(-DGTEST_HAS_PTHREAD=0) - # gtest-all.cc includes all other sources add_library(gtest STATIC src/gtest-all.cc) |