immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Merge pull request #88 from OdyX/dev-graphics-system-gtools" 

This reverts commit f5b4705cad, reversing
changes made to 4811defca2.
dev-ui
Piotr Dziwinski 2012-12-16 13:33:05 +01:00
parent f5b4705cad
commit f9f15a2f3f
2 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
CMakeLists.txt
View File

@ -127,25 +127,9 @@ endif()
##
if(${TESTS})
# Google Mock
find_path(GMOCK_INCLUDE_DIR NAMES gmock.h PATH_SUFFIXES gmock)
find_path(GMOCK_SRC_DIR NAMES src/gmock-all.cc PATHS /usr/src/ PATH_SUFFIXES gmock)
# 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 AND GMOCK_INCLUDE_DIR AND GMOCK_SRC_DIR)
include_directories(${GMOCK_SRC_DIR})
else(GTEST_SRC_DIR AND GMOCK_INCLUDE_DIR AND GMOCK_SRC_DIR)
set(GTEST_SRC_DIR lib/gtest)
set(GMOCK_SRC_DIR ${GTEST_SRC_DIR})
set(GMOCK_INCLUDE_DIR ${GTEST_SRC_DIR}/include/gmock)
include_directories(${GTEST_SRC_DIR} ${GTEST_SRC_DIR}/include/)
endif(GTEST_SRC_DIR AND GMOCK_INCLUDE_DIR AND GMOCK_SRC_DIR)
add_library(gmock STATIC ${GMOCK_SRC_DIR}/src/gmock-all.cc)
add_subdirectory(${GTEST_SRC_DIR} bin/test)
message(STATUS "Use Google Mock from ${GMOCK_SRC_DIR}")
message(STATUS "Use Google Test from ${GTEST_SRC_DIR}")
set(GTEST_DIR "${colobot_SOURCE_DIR}/lib/gtest")
add_subdirectory(lib/gtest bin/test)
endif()
# Subdirectory with sources

1
lib/gtest/CMakeLists.txt
View File

@ -7,3 +7,4 @@ add_definitions(-DGTEST_HAS_PTHREAD=0)
# gtest-all.cc includes all other sources
add_library(gtest STATIC src/gtest-all.cc)
add_library(gmock STATIC src/gmock-all.cc)