gnucash unstable: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/40a266fc (commit)
	 via  https://github.com/Gnucash/gnucash/commit/51851965 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/0a3f2dd3 (commit)
	from  https://github.com/Gnucash/gnucash/commit/4ba77f7b (commit)



commit 40a266fc62921e95420cad6bb7c6246bca8e3c97
Author: John Ralls <john at localhost.localdomain>
Date:   Sat Apr 14 16:03:04 2018 -0700

    One more catch-by-value error.

diff --git a/libgnucash/engine/test/gtest-gnc-numeric.cpp b/libgnucash/engine/test/gtest-gnc-numeric.cpp
index 8326071..f6ba3f1 100644
--- a/libgnucash/engine/test/gtest-gnc-numeric.cpp
+++ b/libgnucash/engine/test/gtest-gnc-numeric.cpp
@@ -223,7 +223,7 @@ TEST(gncnumeric_stream, output_stream)
         else
             EXPECT_EQ("123\xe2\x80\xaf""456", output.str());
     }
-    catch (std::runtime_error)
+    catch (std::runtime_error& err)
     {
         output.imbue(std::locale("fr_FR"));
         output.str("");

commit 518519654cb6c41bf3bd0ad8913e5357d8314b8d
Merge: 4ba77f7 0a3f2dd
Author: John Ralls <john at localhost.localdomain>
Date:   Sat Apr 14 15:52:26 2018 -0700

    Merge Bill Nottingham's 'gmock-trial' into unstable.


commit 0a3f2dd3ef7dc16e4d2de2eebdadbca23c0b98e3
Author: Bill Nottingham <notting at splat.cc>
Date:   Tue Apr 3 21:59:50 2018 -0400

    Allow building against a shared libgmock (an option in gtest-1.8.0).

diff --git a/common/cmake_modules/GncAddTest.cmake b/common/cmake_modules/GncAddTest.cmake
index 9c7863c..47fc988 100644
--- a/common/cmake_modules/GncAddTest.cmake
+++ b/common/cmake_modules/GncAddTest.cmake
@@ -149,6 +149,8 @@ FUNCTION(GNC_GTEST_CONFIGURE)
   FIND_PATH(GMOCK_INCLUDE_DIR gmock/gmock.h
     PATHS ${GMOCK_ROOT}/include /usr/include)
   unset(GMOCK_SRC_DIR CACHE)
+  FIND_LIBRARY(GMOCK_SHARED_LIB gmock)
+  FIND_LIBRARY(GMOCK_MAIN_LIB gmock_main)
   FIND_PATH(GMOCK_SRC_DIR src/gmock-all.cc
     PATHS ${GMOCK_ROOT} /usr/src/gmock)
   if (GMOCK_SRC_DIR)
@@ -160,10 +162,15 @@ FUNCTION(GNC_GTEST_CONFIGURE)
       SET(GMOCK_MAIN_SRC_DIR "${GMOCK_SRC_DIR}")
     endif()
   endif()
-  if (GMOCK_INCLUDE_DIR AND GMOCK_SRC_DIR)
+  if (GMOCK_INCLUDE_DIR AND (GMOCK_SHARED_LIB OR GMOCK_SRC_DIR))
     SET(GMOCK_FOUND YES PARENT_SCOPE)
-    SET(GMOCK_SRC "${GMOCK_MAIN_SRC_DIR}/gmock-all.cc" PARENT_SCOPE)
-    SET(GMOCK_LIB "${CMAKE_BINARY_DIR}/common/test-core/libgmock.a" PARENT_SCOPE)
+    IF(GMOCK_SHARED_LIB)
+      SET(GMOCK_LIB "${GMOCK_SHARED_LIB};${GMOCK_MAIN_LIB}" PARENT_SCOPE)
+      UNSET(GMOCK_SRC_DIR CACHE)
+    ELSE()
+      SET(GMOCK_SRC "${GMOCK_MAIN_SRC_DIR}/gmock-all.cc" PARENT_SCOPE)
+      SET(GMOCK_LIB "${CMAKE_BINARY_DIR}/common/test-core/libgmock.a" PARENT_SCOPE)
+    ENDIF()
   ELSE()
     MESSAGE(FATAL_ERROR "GMOCK not found. Please install it or set GMOCK_ROOT")
   ENDIF()
diff --git a/common/test-core/CMakeLists.txt b/common/test-core/CMakeLists.txt
index ce4ed3a..5281565 100644
--- a/common/test-core/CMakeLists.txt
+++ b/common/test-core/CMakeLists.txt
@@ -75,13 +75,15 @@ IF(NOT GTEST_SHARED_LIB)
   ENDIF()
   TARGET_INCLUDE_DIRECTORIES(gtest PUBLIC ${GTEST_INCLUDE_DIR} ${GTEST_SRC_DIR})
 ENDIF()
-SET (lib_gmock_SOURCES ${GMOCK_SRC})
-ADD_LIBRARY(gmock STATIC  ${lib_gmock_SOURCES})
-IF (APPLE)
-  TARGET_COMPILE_OPTIONS(gmock PRIVATE -Wno-missing-prototypes)
-ELSE()
-  TARGET_COMPILE_OPTIONS(gmock PRIVATE -Wno-missing-declarations)
+IF(NOT GMOCK_SHARED_LIB)
+  SET (lib_gmock_SOURCES ${GMOCK_SRC})
+  ADD_LIBRARY(gmock STATIC  ${lib_gmock_SOURCES})
+  IF (APPLE)
+    TARGET_COMPILE_OPTIONS(gmock PRIVATE -Wno-missing-prototypes)
+  ELSE()
+    TARGET_COMPILE_OPTIONS(gmock PRIVATE -Wno-missing-declarations)
+  ENDIF()
+  TARGET_INCLUDE_DIRECTORIES(gmock PUBLIC
+    ${GTEST_INCLUDE_DIR} ${GTEST_SRC_DIR}
+    ${GMOCK_INCLUDE_DIR} ${GMOCK_SRC_DIR})
 ENDIF()
-TARGET_INCLUDE_DIRECTORIES(gmock PUBLIC
-  ${GTEST_INCLUDE_DIR} ${GTEST_SRC_DIR}
-  ${GMOCK_INCLUDE_DIR} ${GMOCK_SRC_DIR})



Summary of changes:
 common/cmake_modules/GncAddTest.cmake        | 13 ++++++++++---
 common/test-core/CMakeLists.txt              | 20 +++++++++++---------
 libgnucash/engine/test/gtest-gnc-numeric.cpp |  2 +-
 3 files changed, 22 insertions(+), 13 deletions(-)