From 4808eefd7deed08f353c8d25c45ee5fb4cba0046 Mon Sep 17 00:00:00 2001 From: Didier Raboud Date: Sun, 16 Dec 2012 16:09:58 +0100 Subject: Fix Google Mock system library building --- CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d6cf8a2..d072fd0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -146,13 +146,17 @@ if(${TESTS}) 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}") + + include_directories(${GMOCK_SRC_DIR}) + # gmock-all.cc includes all other sources + add_library(gmock STATIC ${GMOCK_SRC_DIR}/src/gmock-all.cc) 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) + add_subdirectory(${GMOCK_SRC_DIR} bin/gmock) endif() - add_subdirectory(${GMOCK_SRC_DIR} bin/gmock) endif() # Subdirectory with sources -- cgit v1.2.3-1-g7c22