diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-12-16 13:22:58 +0100 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-12-16 13:22:58 +0100 |
| commit | 56a170391f944f7a042b81fe7e6817a0c28fb005 (patch) | |
| tree | 6a4d1adaf2a094d98852e77e7178713884a5b66a /CMakeLists.txt | |
| parent | 72ce040054f1ee20576094220075af4283674720 (diff) | |
| download | colobot-56a170391f944f7a042b81fe7e6817a0c28fb005.tar.gz colobot-56a170391f944f7a042b81fe7e6817a0c28fb005.tar.bz2 colobot-56a170391f944f7a042b81fe7e6817a0c28fb005.zip | |
Split gtest and gmock, fixed using system packages
- split the bundled gtest and gmock libraries
- allowed the use of system gmock
- refactoring in CMakeLists
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 29 |
1 files changed, 24 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5873776..d6cf8a2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -129,15 +129,34 @@ endif() if(${TESTS}) # Google Test library - find_path(GTEST_SRC_DIR NAMES src/gtest.cc src/gtest-all.cc PATHS /usr/src/ PATH_SUFFIXES gtest) - if(GTEST_SRC_DIR) - add_subdirectory(${GTEST_SRC_DIR} bin/test) + 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) + message(STATUS "Using system gtest library in ${GTEST_SRC_DIR}") else() - add_subdirectory(lib/gtest bin/test) + message(STATUS "Using bundled gtest library") + set(GTEST_SRC_DIR ${colobot_SOURCE_DIR}/lib/gtest) + set(GTEST_INCLUDE_DIR ${colobot_SOURCE_DIR}/lib/gtest/include) endif() + + add_subdirectory(${GTEST_SRC_DIR} bin/gtest) + + # 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) + message(STATUS "Using system gmock library in ${GMOCK_SRC_DIR}") + else() + message(STATUS "Using bundled gmock library") + set(GMOCK_SRC_DIR ${colobot_SOURCE_DIR}/lib/gmock) + set(GMOCK_INCLUDE_DIR ${colobot_SOURCE_DIR}/lib/gmock/include) + endif() + + add_subdirectory(${GMOCK_SRC_DIR} bin/gmock) endif() # Subdirectory with sources add_subdirectory(src bin) -INSTALL_FILES(/share/games/colobot ../data) +# TODO: provide data files as git submodule and setup correct data path +install_files(/share/games/colobot ../data) |