diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-12-14 21:42:43 +0100 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-12-14 21:42:43 +0100 |
| commit | a4cf777fb8cb939db10998853fc9e40deb64aa8d (patch) | |
| tree | eddafe06250b4f510ed1d33f47a1a3ab5d833285 /CMakeLists.txt | |
| parent | 3f79167323e099ebf7ede9460d454958926f55a1 (diff) | |
| download | colobot-a4cf777fb8cb939db10998853fc9e40deb64aa8d.tar.gz colobot-a4cf777fb8cb939db10998853fc9e40deb64aa8d.tar.bz2 colobot-a4cf777fb8cb939db10998853fc9e40deb64aa8d.zip | |
Reverted lib/, fixed gtest path in CMakeLists.txt
Some gtest system packages use name gtest-all.cc.
lib/ directory should be left in repository.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3a925e8..1ec7297 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -126,12 +126,12 @@ endif() if(${TESTS}) # Google Test library - find_path(GTEST_SRC_DIR src/gtest.cc PATHS /usr/src/ PATH_SUFFIXES gtest) + 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) - else(GTEST_SRC_DIR) + else() add_subdirectory(lib/gtest bin/test) - endif(GTEST_SRC_DIR) + endif() endif() # Subdirectory with sources |