gnucash master: Fix cmake's gmock handling to work with Fedora packages
Geert Janssens
gjanssens at code.gnucash.org
Mon Feb 6 10:18:37 EST 2017
Updated via https://github.com/Gnucash/gnucash/commit/1241b717 (commit)
from https://github.com/Gnucash/gnucash/commit/659c96eb (commit)
commit 1241b717706a7161e2d79a90e8cdb9d5ecfb817a
Author: Geert Janssens <geert at kobaltwit.be>
Date: Mon Feb 6 10:37:39 2017 +0100
Fix cmake's gmock handling to work with Fedora packages
Similar checks were already in configure.ac for the autotools variant
diff --git a/src/cmake_modules/GncAddTest.cmake b/src/cmake_modules/GncAddTest.cmake
index 445b412..22b401b 100644
--- a/src/cmake_modules/GncAddTest.cmake
+++ b/src/cmake_modules/GncAddTest.cmake
@@ -116,11 +116,15 @@ 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 src/gmock-all.cc
- PATHS ${GMOCK_ROOT} /usr/src/gmock)
+ 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 gmock-all.cc
+ PATHS ${GMOCK_ROOT} /usr/src/gmock)
+ endif()
if (GMOCK_INCLUDE_DIR AND GMOCK_SRC_DIR)
SET(GMOCK_FOUND YES PARENT_SCOPE)
- SET(GMOCK_SRC "${GMOCK_SRC_DIR}/src/gmock_main.cc" PARENT_SCOPE)
+ SET(GMOCK_SRC "${GMOCK_SRC_DIR}/gmock_main.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")
diff --git a/src/test-core/CMakeLists.txt b/src/test-core/CMakeLists.txt
index a6a0c9e..50d85e7 100644
--- a/src/test-core/CMakeLists.txt
+++ b/src/test-core/CMakeLists.txt
@@ -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}/src/gmock-all.cc)
+SET (lib_gmock_SOURCES ${GMOCK_SRC_DIR}/gmock-all.cc)
ADD_LIBRARY(gmock STATIC ${lib_gmock_SOURCES})
TARGET_INCLUDE_DIRECTORIES(gmock PUBLIC
${GTEST_INCLUDE_DIR} ${GTEST_SRC_DIR}
Summary of changes:
src/cmake_modules/GncAddTest.cmake | 10 +++++++---
src/test-core/CMakeLists.txt | 2 +-
2 files changed, 8 insertions(+), 4 deletions(-)
More information about the gnucash-changes
mailing list