gnucash master: Multiple changes pushed

John Ralls jralls at code.gnucash.org
Thu Sep 5 17:42:06 EDT 2019


Updated	 via  https://github.com/Gnucash/gnucash/commit/e16308b1 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/c53f07c1 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/97a81980 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/3c93f181 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/d637c53f (commit)
	 via  https://github.com/Gnucash/gnucash/commit/53fe478c (commit)
	 via  https://github.com/Gnucash/gnucash/commit/84d9f1c9 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/b303fc6d (commit)
	 via  https://github.com/Gnucash/gnucash/commit/7e71a972 (commit)
	from  https://github.com/Gnucash/gnucash/commit/44adc054 (commit)



commit e16308b10f56f9466992fb79b61263a53b4329c3
Merge: 44adc0543 c53f07c17
Author: John Ralls <jralls at ceridwen.us>
Date:   Thu Sep 5 14:16:03 2019 -0700

    Merge Christian Gruber's 'rework_gtest_integration' into master.

commit c53f07c170afd5a8b134d28fa3021922ff660da0
Author: Christian Gruber <christian.gruber at posteo.de>
Date:   Thu Sep 5 21:35:57 2019 +0200

    fixup! Remove support for GoogleTest/GoogleMock <= v1.8.0

commit 97a81980e574eb6a9d474e53fdd5265e060af22e
Author: Christian Gruber <christian.gruber at posteo.de>
Date:   Wed Sep 4 22:06:32 2019 +0200

    Remove support for GoogleTest/GoogleMock <= v1.8.0
    
    This simplifies function gnc_gtest_configure(), since GoogleTest and
    GoogleMock are combined in one source directory.
    
    Additionally variable GMOCK_ROOT is not necessary anymore and is
    removed.

commit 3c93f18115b8da4f38f7211887021064dc19e6f8
Author: Christian Gruber <christian.gruber at posteo.de>
Date:   Fri Aug 30 23:22:22 2019 +0200

    Additionally search for system headers, if sources are found in /usr/src

commit d637c53fff2a93d3dba71de4e2b5d5111f233764
Author: Christian Gruber <christian.gruber at posteo.de>
Date:   Thu Aug 29 23:36:05 2019 +0200

    Separate search for GTEST/GMOCK sources into different cases
    
    1. If GTEST_ROOT and/or GMOCK_ROOT are defined, sources are expected
    somewhere inside these directories. Otherwise a CMake error is
    generated. Different source directory layouts are considered.
    
    2. If GTEST_ROOT and GMOCK_ROOT are both not defined, sources are
    searched in /usr/src. Different source directory layouts are considered.
    
    3. If sources are not found in one of the first two cases, preinstalled
    libraries are searched.
    
    Additionally using HINTS in function find_path() has been replaced by
    PATHS and PATH_SUFFIXES. According to CMake documentation in case of
    hard-coded guesses PATHS should be used. Remark: This reverts commit
    5f53e29, but instead NO_CMAKE_SYSTEM_PATH is used now to prevent CMake
    from searching in system paths.
    
    Hint: There was a special handling implemented regarding search for
    gmock-all.cc. This file was additionally searched in /usr/src/gmock
    directly instead of /usr/src/gmock/src (see commit 1241b71). This
    special handling has been kept in case of searching sources in
    /usr/src/gmock, but not in case of searching sources in GMOCK_ROOT or
    GTEST_ROOT.

commit 53fe478ce181896cad2ea21d3fd2c2169ad4e1ee
Author: Christian Gruber <christian.gruber at posteo.de>
Date:   Thu Aug 29 22:34:19 2019 +0200

    Do not search for headers anymore, if sources are already found
    
    if GTEST/GMOCK sources are already found, only check if gtest/gtest.h
    and gmock/gmock.h exist at GTEST_SRC_DIR/include and
    GMOCK_SRC_DIR/include and set GTEST_INCLUDE_DIR and GMOCK_INCLUDE_DIR
    accordingly.

commit 84d9f1c9a58d837fd036d5820a7c234cd9fbe230
Author: Christian Gruber <christian.gruber at posteo.de>
Date:   Wed Aug 21 23:36:17 2019 +0200

    Change search strategy for prebuilt GoogleTest/GoogleMock libraries
    
    Prebuilt GoogleTest/GoogleMock libraries are now only searched, if
    GTEST_ROOT and GMOCK_ROOT are not defined.

commit b303fc6d99d22bb88518a3085099061f3c74c13d
Author: Christian Gruber <christian.gruber at posteo.de>
Date:   Sun Aug 18 00:30:42 2019 +0200

    Use target gtest instead of GTEST_LIB and GTEST_INCLUDE_DIR
    
    This simplifies usage of GoogleTest, since independent handling of
    GTEST_LIB and GTEST_INCLUDE_DIR is not necessary anymore.
    
    Additionally CMake creates a dependency now between target gtest and all
    test applications using it. This improves build process when building
    GoogleTest from source code. When any test application is built,
    GoogleTest library is automatically rebuilt if necessary now for
    instance.

commit 7e71a9724fc454b482460de5e09fa216e3c21fe7
Author: Christian Gruber <christian.gruber at posteo.de>
Date:   Sat Aug 17 23:03:45 2019 +0200

    Change search strategy for prebuilt GoogleTest/GoogleMock libraries
    
    Prebuilt GoogleTest/GoogleMock libraries are now only searched, if
    GoogleTest source code wasn't found.



Summary of changes:
 CMakeLists.txt                                    |  1 -
 common/cmake_modules/GncAddTest.cmake             | 98 ++++++++++++++---------
 common/cmake_modules/MakeDistCheck.cmake          |  1 -
 common/test-core/CMakeLists.txt                   | 11 ++-
 gnucash/import-export/csv-imp/test/CMakeLists.txt |  5 +-
 libgnucash/core-utils/test/CMakeLists.txt         |  3 +-
 libgnucash/engine/test/CMakeLists.txt             |  5 +-
 util/ci/ubuntu-16.04-testscript                   |  2 +-
 8 files changed, 74 insertions(+), 52 deletions(-)



More information about the gnucash-patches mailing list