gnucash master: Work around googletest bug 920.

John Ralls jralls at code.gnucash.org
Mon Apr 17 14:51:55 EDT 2017


Updated	 via  https://github.com/Gnucash/gnucash/commit/b2b32e29 (commit)
	from  https://github.com/Gnucash/gnucash/commit/bf305220 (commit)



commit b2b32e29fa070507f105b8be40bbaf7c629856a4
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon Apr 17 11:52:16 2017 -0700

    Work around googletest bug 920.
    
    https://github.com/google/googletest/issues/920, already addressed in configure.ac.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7343b9d..6429081 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -457,7 +457,7 @@ IF (UNIX)
 ENDIF (UNIX)
 IF (MINGW)
   SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Wdeclaration-after-statement -Wno-pointer-sign -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations  -Wno-unused -std=gnu11")
-  SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DWINVER=0x0500") # Workaround for bug in gtest on mingw, see https://github.com/google/googletest/issues/893
+  SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DWINVER=0x0500 -D_EMULATE_GLIBC=0") # Workaround for bug in gtest on mingw, see https://github.com/google/googletest/issues/893 and https://github.com/google/googletest/issues/920
 ENDIF (MINGW)
 IF (APPLE)
   SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-local-typedef")



Summary of changes:
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)



More information about the gnucash-changes mailing list