Merge Chris Good's 'fixpaths' into maint.

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

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)

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