summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorPiotr Dziwinski <piotrdz@gmail.com>2013-01-08 22:12:09 +0100
committerPiotr Dziwinski <piotrdz@gmail.com>2013-01-08 22:12:09 +0100
commit1285712aa22382a1a0d943aa29b310ecf6ebd365 (patch)
treed3e621fe3309b6ea11877cd1ec3f8ca857d251bd /lib
parent5a6b3f005a83363d323e00b499756d6ecc277574 (diff)
downloadcolobot-1285712aa22382a1a0d943aa29b310ecf6ebd365.tar.gz
colobot-1285712aa22382a1a0d943aa29b310ecf6ebd365.tar.bz2
colobot-1285712aa22382a1a0d943aa29b310ecf6ebd365.zip
CMakeLists enhancements
- compiler detection (clang and gcc version check) - compile flags only for src/ subdir - system and local include paths - fix for clang compilation
Diffstat (limited to 'lib')
-rw-r--r--lib/gmock/CMakeLists.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/gmock/CMakeLists.txt b/lib/gmock/CMakeLists.txt
index 3fec0d3..e7ff803 100644
--- a/lib/gmock/CMakeLists.txt
+++ b/lib/gmock/CMakeLists.txt
@@ -1,5 +1,7 @@
cmake_minimum_required(VERSION 2.8)
+set(CMAKE_CXX_FLAGS "${${ORIGINAL_CXX_FLAGS}}")
+
include_directories(. include ${GTEST_INCLUDE_DIR})
# gmock-all.cc includes all other sources