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 /src/ui/test/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 'src/ui/test/CMakeLists.txt')
| -rw-r--r-- | src/ui/test/CMakeLists.txt | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/ui/test/CMakeLists.txt b/src/ui/test/CMakeLists.txt index 9e11e14..e411067 100644 --- a/src/ui/test/CMakeLists.txt +++ b/src/ui/test/CMakeLists.txt @@ -1,13 +1,17 @@ cmake_minimum_required(VERSION 2.8) -set(CMAKE_BUILD_TYPE debug) -set(CMAKE_CXX_FLAGS_DEBUG "-g -O0 -Wall -Wold-style-cast -std=gnu++0x") +if(NOT CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE debug) +endif(NOT CMAKE_BUILD_TYPE) +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wold-style-cast -std=gnu++0x") +set(CMAKE_CXX_FLAGS_DEBUG "-g -O0") include_directories( . ../.. ../../.. -${GTEST_DIR}/include +${GTEST_INCLUDE_DIR} +${GMOCK_INCLUDE_DIR} ) |