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 /CMakeLists.txt | |
| 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 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 949653e..d04176c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -140,6 +140,9 @@ option(BOOST_STATIC "Link with static boost libraries" OFF) # This is useful on Windows, if linking against standard GLEW dll fails option(GLEW_STATIC "Link statically with GLEW" OFF) +# Sometimes helpful if there are different versions of gmock/gtest installed on system vs bundled +option(FORCE_BUNDLED_GTEST "Force the use of bundled gtest" OFF) +option(FORCE_BUNDLED_GMOCK "Force the use of bundled gmock" OFF) # Default build type if not given is debug if(NOT DEFINED CMAKE_BUILD_TYPE) @@ -255,7 +258,7 @@ if(TESTS) # Google Test library find_path(GTEST_SRC_DIR NAMES src/gtest.cc src/gtest-all.cc PATHS /usr/src PATH_SUFFIXES gtest) find_path(GTEST_INCLUDE_DIR gtest/gtest.h PATHS /usr/include) - if(GTEST_SRC_DIR AND GTEST_INCLUDE_DIR) + if(NOT(FORCE_BUNDLED_GTEST) AND GTEST_SRC_DIR AND GTEST_INCLUDE_DIR) message(STATUS "Using system gtest library in ${GTEST_SRC_DIR}") else() message(STATUS "Using bundled gtest library") @@ -268,7 +271,7 @@ if(TESTS) # Google Mock library find_path(GMOCK_SRC_DIR NAMES src/gmock.cc src/gmock-all.cc PATHS /usr/src PATH_SUFFIXES gmock) find_path(GMOCK_INCLUDE_DIR gmock/gmock.h PATHS /usr/include) - if(GMOCK_SRC_DIR AND GMOCK_INCLUDE_DIR) + if(NOT(FORCE_BUNDLED_GMOCK) GMOCK_SRC_DIR AND GMOCK_INCLUDE_DIR) message(STATUS "Using system gmock library in ${GMOCK_SRC_DIR}") include_directories(${GMOCK_SRC_DIR}) |