gnucash maint: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/b99dfb78 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/39c9aa4d (commit)
	 via  https://github.com/Gnucash/gnucash/commit/ba26c6a8 (commit)
	from  https://github.com/Gnucash/gnucash/commit/b7f6cfe6 (commit)



commit b99dfb78a7427a887e2dc0b0b0179b6784f458b3
Merge: b7f6cfe60 39c9aa4de
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Mar 22 11:50:13 2020 -0700

    Merge Chris Good's 'fixpaths' into maint.


commit 39c9aa4de34d2272a00c439514f58738111c4715
Author: goodvibes2 <goodchris96 at gmail.com>
Date:   Sun Mar 22 17:57:27 2020 +1100

    Remove bad paths from CMakeLists.txt files

diff --git a/gnucash/import-export/csv-imp/test/CMakeLists.txt b/gnucash/import-export/csv-imp/test/CMakeLists.txt
index 217cbf3ed..5bdef1f97 100644
--- a/gnucash/import-export/csv-imp/test/CMakeLists.txt
+++ b/gnucash/import-export/csv-imp/test/CMakeLists.txt
@@ -4,7 +4,6 @@ set(CSV_IMP_TEST_INCLUDE_DIRS
   ${CMAKE_SOURCE_DIR}/common
   ${CMAKE_SOURCE_DIR}/libgnucash/engine
   ${CMAKE_SOURCE_DIR}/common/test-core
-  ${CMAKE_SOURCE_DIR}/lib
   ${GLIB2_INCLUDE_DIRS}
 )
 set(CSV_IMP_TEST_LIBS gncmod-csv-import gncmod-engine test-core)
diff --git a/libgnucash/engine/test-core/CMakeLists.txt b/libgnucash/engine/test-core/CMakeLists.txt
index 9dddffdcb..0be8b23de 100644
--- a/libgnucash/engine/test-core/CMakeLists.txt
+++ b/libgnucash/engine/test-core/CMakeLists.txt
@@ -7,7 +7,6 @@ set(libgncmod_test_engine_SOURCES
 add_library(gncmod-test-engine STATIC ${libgncmod_test_engine_SOURCES})
 
 target_include_directories(gncmod-test-engine PRIVATE
-  ${CMAKE_PREFIX_PATH}/include
   ${GMODULE_INCLUDE_DIRS}
   ${CMAKE_SOURCE_DIR}/libgnucash/gnc-module
   ${CMAKE_BINARY_DIR}/common # for config.h

commit ba26c6a8205c9b6ed8fb266f2349cc86ed397ce7
Author: goodvibes2 <goodchris96 at gmail.com>
Date:   Sun Mar 22 14:53:00 2020 +1100

    Fix path errors in CMakeLists.txt files

diff --git a/gnucash/import-export/aqb/test/CMakeLists.txt b/gnucash/import-export/aqb/test/CMakeLists.txt
index abcc5b339..6b504fab9 100644
--- a/gnucash/import-export/aqb/test/CMakeLists.txt
+++ b/gnucash/import-export/aqb/test/CMakeLists.txt
@@ -7,8 +7,8 @@ set(test_aqb_INCLUDE_DIRS
   ${CMAKE_SOURCE_DIR}/gnucash/import-export
   ${CMAKE_SOURCE_DIR}/gnucash/gnome
   ${CMAKE_SOURCE_DIR}/gnucash/register/ledger-core
-  ${CMAKE_SOURCE_DIR}/gnucash/register/regiser-gnome
-  ${CMAKE_SOURCE_DIR}/gnucash/register/regitser-core
+  ${CMAKE_SOURCE_DIR}/gnucash/register/register-gnome
+  ${CMAKE_SOURCE_DIR}/gnucash/register/register-core
   ${CMAKE_SOURCE_DIR}/gnucash/gnome-utils
   ${CMAKE_SOURCE_DIR}/libgnucash/app-utils
   ${CMAKE_SOURCE_DIR}/libgnucash/engine



Summary of changes:
 gnucash/import-export/aqb/test/CMakeLists.txt     | 4 ++--
 gnucash/import-export/csv-imp/test/CMakeLists.txt | 1 -
 libgnucash/engine/test-core/CMakeLists.txt        | 1 -
 3 files changed, 2 insertions(+), 4 deletions(-)