IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2026-09-03 20:53:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

One more stab at properly discovering gtest/gmock

Browse Source 
My previous attempt made wrong assumptions on the
way source files got included in the mock tree.
This commit is contained in:
Geert Janssens
2017-02-08 17:16:58 +01:00
parent 1241b71770
commit 2d451801e9
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cmake_modules/GncAddTest.cmake
+9 -4
View File
@@ -116,15 +116,20 @@ FUNCTION(GNC_GTEST_CONFIGURE)
MESSAGE(STATUS "Checking for GMOCK")
FIND_PATH(GMOCK_INCLUDE_DIR gmock/gmock.h
PATHS ${GMOCK_ROOT}/include /usr/include)
FIND_PATH(GMOCK_SRC_DIR gmock-all.cc
PATHS ${GMOCK_ROOT}/src /usr/src/gmock/src)
if (NOT GMOC_SRC_DIR)
FIND_PATH(GMOCK_SRC_DIR src/gmock-all.cc
PATHS ${GMOCK_ROOT} /usr/src/gmock)
if (GMOCK_SRC_DIR)
SET(GMOCK_MAIN_SRC_DIR "${GMOCK_SRC_DIR}/src")
else()
FIND_PATH(GMOCK_SRC_DIR gmock-all.cc
PATHS ${GMOCK_ROOT} /usr/src/gmock)
if (GMOCK_SRC_DIR)
SET(GMOCK_MAIN_SRC_DIR "${GMOCK_SRC_DIR}")
endif()
endif()
if (GMOCK_INCLUDE_DIR AND GMOCK_SRC_DIR)
SET(GMOCK_FOUND YES PARENT_SCOPE)
SET(GMOCK_SRC "${GMOCK_SRC_DIR}/gmock_main.cc" PARENT_SCOPE)
SET(GMOCK_SRC "${GMOCK_MAIN_SRC_DIR}/gmock-all.cc" PARENT_SCOPE)
SET(GMOCK_LIB "${CMAKE_BINARY_DIR}/src/test-core/libgmock.a" PARENT_SCOPE)
ELSE()
MESSAGE(FATAL_ERROR "GMOCK not found. Please install it or set GMOCK_ROOT")
src/test-core/CMakeLists.txt
+1 -1
View File
@@ -70,7 +70,7 @@ IF(NOT GTEST_SHARED_LIB)
ADD_LIBRARY(gtest STATIC ${lib_gtest_SOURCES})
TARGET_INCLUDE_DIRECTORIES(gtest PUBLIC ${GTEST_INCLUDE_DIR} ${GTEST_SRC_DIR})
ENDIF()
SET (lib_gmock_SOURCES ${GMOCK_SRC_DIR}/gmock-all.cc)
SET (lib_gmock_SOURCES ${GMOCK_SRC})
ADD_LIBRARY(gmock STATIC ${lib_gmock_SOURCES})
TARGET_INCLUDE_DIRECTORIES(gmock PUBLIC
${GTEST_INCLUDE_DIR} ${GTEST_SRC_DIR}