gnucash maint: Multiple changes pushed

John Ralls jralls at code.gnucash.org
Thu Aug 15 18:26:33 EDT 2019


Updated	 via  https://github.com/Gnucash/gnucash/commit/8eb3819a (commit)
	 via  https://github.com/Gnucash/gnucash/commit/1b4e4812 (commit)
	from  https://github.com/Gnucash/gnucash/commit/24d45766 (commit)



commit 8eb3819a3c96ddc5df55f9358ddc1a55ae2645e7
Merge: 24d457661 1b4e48129
Author: John Ralls <jralls at ceridwen.us>
Date:   Thu Aug 15 15:18:07 2019 -0700

    Merge Christian Gruber's 'rework_gtest_src' into maint.

commit 1b4e481296d7b836fcbb6f86de46bc9faba84ef0
Author: Christian Gruber <christian.gruber at posteo.de>
Date:   Thu Aug 15 23:20:45 2019 +0200

    Add gtest_main.cc to libgtest.a
    
    Currently when compiling GoogleTest from source code, source file
    gtest_main.cc from GoogleTest repository is not compiled into any
    library as in GoogleTest repository, where it is compiled into
    libgtest_main.a. Instead gtest_main.cc is added to source file list
    GTEST_SRC, which is then added to the list of source files of every
    single GoogleTest based test application.
    
    To simplify this gtest_main.cc is added to the source file list of
    target gtest now. Additionally GTEST_SRC is merged into
    lib_gtest_SOURCES, since both variables defined source files for
    GoogleTest libraries.
    
    Now target gtest generates library libgtest.a, which already contains
    the main function from source file gtest_main.cc. This is different to
    GoogleTest build system, where both are separated into two independent
    libraries libgtest.a and libgtest_main.a.



Summary of changes:
 common/cmake_modules/GncAddTest.cmake             |  5 +++-
 common/test-core/CMakeLists.txt                   |  3 ++-
 gnucash/import-export/csv-imp/test/CMakeLists.txt |  6 ++---
 libgnucash/core-utils/test/CMakeLists.txt         |  3 +--
 libgnucash/engine/test/CMakeLists.txt             | 30 ++++++++---------------
 5 files changed, 19 insertions(+), 28 deletions(-)



More information about the gnucash-patches mailing list