gnucash master: Fix CMake build after maint merge
John Ralls
jralls at code.gnucash.org
Tue Jan 26 14:08:10 EST 2016
Updated via https://github.com/Gnucash/gnucash/commit/0031478d (commit)
from https://github.com/Gnucash/gnucash/commit/7f65a335 (commit)
commit 0031478d86a4bd6cf63a73dd74929488643dc406
Author: RobGowin <robgowin at gmail.com>
Date: Tue Jan 26 09:00:54 2016 -0600
Fix CMake build after maint merge
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d29fd03..84e78b7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,7 @@ ENDIF()
PROJECT (Gnucash)
-#ENABLE_TESTING()
+ENABLE_TESTING()
# Version number of gnucash
SET (GNUCASH_MAJOR_VERSION 2)
@@ -45,7 +45,7 @@ INCLUDE (CheckIncludeFiles)
INCLUDE (GncAddSchemeTargets)
INCLUDE (GncConfigure)
INCLUDE (GncAddGSchemaTargets)
-#INCLUDE (GncAddTest)
+INCLUDE (GncAddTest)
# ############################################################
# These options are settable from the CMake command line. For example, to disable
@@ -79,8 +79,8 @@ SET(DATADIRNAME share)
SET(GNC_SYSTEM_XDG_DATA_DIRS /usr/local/share /usr/share)
SET(GNC_DBD_DIR ${CMAKE_PREFIX_PATH}/lib/dbd CACHE PATH "specify location of libdbi drivers")
SET(PKGLIBDIR ${CMAKE_INSTALL_PREFIX}/lib/gnucash)
-#SET(TEST_MYSQL_URL "" CACHE STRING "MySQL database URL for testing")
-#SET(TEST_PGSQL_URL "" CACHE STRING "PgSQL database URL for testing")
+SET(TEST_MYSQL_URL "" CACHE STRING "MySQL database URL for testing")
+SET(TEST_PGSQL_URL "" CACHE STRING "PgSQL database URL for testing")
IF(GNC_BUILD_AS_INSTALL)
SET(DATADIR_BUILD ${CMAKE_BINARY_DIR}/${DATADIRNAME})
@@ -90,11 +90,11 @@ IF(GNC_BUILD_AS_INSTALL)
ENDIF()
-#SET(SHELL_FROM_ENV $ENV{SHELL})
-#SET(SHELL bin/bash)
-#IF (SHELL_FROM_ENV) # Replacing this with IF ($ENV{SHELL}) doesn't work.
-# SET(SHELL ${SHELL_FROM_ENV})
-#ENDIF()
+SET(SHELL_FROM_ENV $ENV{SHELL})
+SET(SHELL bin/bash)
+IF (SHELL_FROM_ENV) # Replacing this with IF ($ENV{SHELL}) doesn't work.
+ SET(SHELL ${SHELL_FROM_ENV})
+ENDIF()
IF (WIN32)
# Help Windows find the various dependencies. We assume here that the standard advice for building
@@ -416,24 +416,24 @@ IF (GNC_BUILD_AS_INSTALL)
ENDIF()
# ############################################################
-#SET(CMAKE_CTEST_COMMAND ctest)
-#IF (XCODE_VERSION)
-# SET(CMAKE_CTEST_COMMAND ctest -C Debug)
-#ENDIF()
+SET(CMAKE_CTEST_COMMAND ctest)
+IF (XCODE_VERSION)
+ SET(CMAKE_CTEST_COMMAND ctest -C Debug)
+ENDIF()
# There are targets that need to build before tests will run
-#ADD_CUSTOM_TARGET(check
-# COMMAND ${CMAKE_CTEST_COMMAND}
-# DEPENDS gnucash scm-app-utils scm-gnome-utils scm-report-gnome
-# scm-engine scm-gnc-module scm-test-engine scm-report-system-3
-# scm-test-core scm-test-report-system scm-standard-reports-2
-# scm-test-standard-reports foo gncmodfoo baz gncmodbaz
-# bar gncmodbar gncmod_agedver gncmod_incompatdep
-# gncmod_futuremodsys
-#)
-#IF (NOT WIN32)
-# ADD_DEPENDENCIES(check gncmod-backend-xml-link)
-#ENDIF()
+ADD_CUSTOM_TARGET(check
+ COMMAND ${CMAKE_CTEST_COMMAND}
+ DEPENDS gnucash scm-app-utils scm-gnome-utils scm-report-gnome
+ scm-engine scm-gnc-module scm-test-engine scm-report-system-3
+ scm-test-core scm-test-report-system scm-standard-reports-2
+ scm-test-standard-reports foo gncmodfoo baz gncmodbaz
+ bar gncmodbar gncmod_agedver gncmod_incompatdep
+ gncmod_futuremodsys
+)
+IF (NOT WIN32)
+ ADD_DEPENDENCIES(check gncmod-backend-xml-link)
+ENDIF()
# The subdirectories
ADD_SUBDIRECTORY (accounts)
diff --git a/src/app-utils/CMakeLists.txt b/src/app-utils/CMakeLists.txt
index 6318fc0..c657f25 100644
--- a/src/app-utils/CMakeLists.txt
+++ b/src/app-utils/CMakeLists.txt
@@ -1,4 +1,4 @@
-#ADD_SUBDIRECTORY(test)
+ADD_SUBDIRECTORY(test)
# Build the library
SET (app_utils_noinst_HEADERS
diff --git a/src/app-utils/test/CMakeLists.txt b/src/app-utils/test/CMakeLists.txt
index 3b48ecc..47fde80 100644
--- a/src/app-utils/test/CMakeLists.txt
+++ b/src/app-utils/test/CMakeLists.txt
@@ -17,12 +17,12 @@ ENDMACRO()
ADD_APP_UTILS_TEST(test-exp-parser test-exp-parser.c)
GNC_ADD_TEST_WITH_GUILE(test-link-module test-link-module APP_UTILS_TEST_INCLUDE_DIRS APP_UTILS_TEST_LIBS)
-ADD_APP_UTILS_TEST(test-print-parse-amount test-print-parse-amount.c)
+ADD_APP_UTILS_TEST(test-print-parse-amount test-print-parse-amount.cpp)
# This test not run in autotools build.
-#GNC_ADD_TEST_WITH_GUILE(test-print-queries test-print-queries.c APP_UTILS_TEST_INCLUDE_DIRS APP_UTILS_TEST_LIBS)
-GNC_ADD_TEST_WITH_GUILE(test-scm-query-string test-scm-query-string.c
+#GNC_ADD_TEST_WITH_GUILE(test-print-queries test-print-queries.cpp APP_UTILS_TEST_INCLUDE_DIRS APP_UTILS_TEST_LIBS)
+GNC_ADD_TEST_WITH_GUILE(test-scm-query-string test-scm-query-string.cpp
APP_UTILS_TEST_INCLUDE_DIRS APP_UTILS_TEST_LIBS
)
-ADD_APP_UTILS_TEST(test-sx test-sx.c)
+ADD_APP_UTILS_TEST(test-sx test-sx.cpp)
GNC_ADD_SCHEME_TEST(scm-test-load-module test-load-module.in)
diff --git a/src/backend/dbi/CMakeLists.txt b/src/backend/dbi/CMakeLists.txt
index a6f3c02..a871a50 100644
--- a/src/backend/dbi/CMakeLists.txt
+++ b/src/backend/dbi/CMakeLists.txt
@@ -1,6 +1,6 @@
# CMakeLists.txt for src/backend/dbi
-#ADD_SUBDIRECTORY(test)
+ADD_SUBDIRECTORY(test)
# Source file gncmod-backend-dbi.c does not appear to be use in Makefile.in, so not included here.
diff --git a/src/backend/dbi/test/CMakeLists.txt b/src/backend/dbi/test/CMakeLists.txt
index d3e7c80..c471030 100644
--- a/src/backend/dbi/test/CMakeLists.txt
+++ b/src/backend/dbi/test/CMakeLists.txt
@@ -14,10 +14,10 @@ SET(BACKEND_DBI_TEST_INCLUDE_DIRS
SET(BACKEND_DBI_TEST_LIBS gnc-backend-sql gncmod-engine gncmod-test-engine gnc-qof test-core ${LIBDBI_LIBRARY})
SET(test_dbi_backend_SOURCES
- test-backend-dbi.c
- test-backend-dbi-basic.c
- test-dbi-business-stuff.c
- test-dbi-stuff.c
+ test-backend-dbi.cpp
+ test-backend-dbi-basic.cpp
+ test-dbi-business-stuff.cpp
+ test-dbi-stuff.cpp
)
GNC_ADD_TEST(test-backend-dbi "${test_dbi_backend_SOURCES}"
diff --git a/src/backend/sql/CMakeLists.txt b/src/backend/sql/CMakeLists.txt
index c9293e2..b50d7fe 100644
--- a/src/backend/sql/CMakeLists.txt
+++ b/src/backend/sql/CMakeLists.txt
@@ -1,6 +1,6 @@
# CMakeLists.txt for src/backend/dbi
-#ADD_SUBDIRECTORY(test)
+ADD_SUBDIRECTORY(test)
SET (backend_sql_SOURCES
gnc-backend-sql.cpp
diff --git a/src/backend/sql/test/CMakeLists.txt b/src/backend/sql/test/CMakeLists.txt
index 2d6a63f..6ab9eaa 100644
--- a/src/backend/sql/test/CMakeLists.txt
+++ b/src/backend/sql/test/CMakeLists.txt
@@ -11,13 +11,13 @@ SET(BACKEND_SQL_TEST_INCLUDE_DIRS
SET(BACKEND_SQL_TEST_LIBS gnc-backend-sql gncmod-engine gnc-qof test-core)
# This test does not actually do anything.
-GNC_ADD_TEST(test-column-types test-column-types.c
+GNC_ADD_TEST(test-column-types test-column-types.cpp
BACKEND_SQL_TEST_INCLUDE_DIRS BACKEND_SQL_TEST_LIBS
)
-GNC_ADD_TEST(test-sqlbe "test-sqlbe.c;utest-gnc-backend-sql.c"
+GNC_ADD_TEST(test-sqlbe "test-sqlbe.cpp;utest-gnc-backend-sql.cpp"
BACKEND_SQL_TEST_INCLUDE_DIRS BACKEND_SQL_TEST_LIBS
)
TARGET_COMPILE_DEFINITIONS(test-sqlbe PRIVATE TESTPROG=test_sqlbe)
\ No newline at end of file
diff --git a/src/backend/xml/CMakeLists.txt b/src/backend/xml/CMakeLists.txt
index 22eeaa7..950119c 100644
--- a/src/backend/xml/CMakeLists.txt
+++ b/src/backend/xml/CMakeLists.txt
@@ -1,6 +1,6 @@
# CMakeLists.txt for src/backend/xml
-#ADD_SUBDIRECTORY(test)
+ADD_SUBDIRECTORY(test)
# Command to generate the swig-engine.c wrapper file
SET (SWIG_GNC_MODULE_C ${CMAKE_CURRENT_BINARY_DIR}/swig-gnc-module.c)
diff --git a/src/backend/xml/test/CMakeLists.txt b/src/backend/xml/test/CMakeLists.txt
index d9e4c7c..bf3fdbd 100644
--- a/src/backend/xml/test/CMakeLists.txt
+++ b/src/backend/xml/test/CMakeLists.txt
@@ -24,13 +24,13 @@ ENDFUNCTION()
################################
SET(test_backend_xml_base_SOURCES
- ${CMAKE_SOURCE_DIR}/src/backend/xml/sixtp-dom-parsers.c
- ${CMAKE_SOURCE_DIR}/src/backend/xml/sixtp-dom-generators.c
- ${CMAKE_SOURCE_DIR}/src/backend/xml/sixtp-utils.c
- ${CMAKE_SOURCE_DIR}/src/backend/xml/sixtp.c
- ${CMAKE_SOURCE_DIR}/src/backend/xml/sixtp-stack.c
- ${CMAKE_SOURCE_DIR}/src/backend/xml/sixtp-to-dom-parser.c
- ${CMAKE_SOURCE_DIR}/src/backend/xml/gnc-xml-helper.c
+ ${CMAKE_SOURCE_DIR}/src/backend/xml/sixtp-dom-parsers.cpp
+ ${CMAKE_SOURCE_DIR}/src/backend/xml/sixtp-dom-generators.cpp
+ ${CMAKE_SOURCE_DIR}/src/backend/xml/sixtp-utils.cpp
+ ${CMAKE_SOURCE_DIR}/src/backend/xml/sixtp.cpp
+ ${CMAKE_SOURCE_DIR}/src/backend/xml/sixtp-stack.cpp
+ ${CMAKE_SOURCE_DIR}/src/backend/xml/sixtp-to-dom-parser.cpp
+ ${CMAKE_SOURCE_DIR}/src/backend/xml/gnc-xml-helper.cpp
)
## the xml backend is now a GModule - this test does
@@ -39,47 +39,47 @@ SET(test_backend_xml_base_SOURCES
SET(test_backend_xml_module_SOURCES
${test_backend_xml_base_SOURCES}
- ${CMAKE_SOURCE_DIR}/src/backend/xml/io-example-account.c
- ${CMAKE_SOURCE_DIR}/src/backend/xml/io-gncxml-gen.c
- ${CMAKE_SOURCE_DIR}/src/backend/xml/io-gncxml-v2.c
- ${CMAKE_SOURCE_DIR}/src/backend/xml/io-utils.c
- ${CMAKE_SOURCE_DIR}/src/backend/xml/gnc-account-xml-v2.c
- ${CMAKE_SOURCE_DIR}/src/backend/xml/gnc-budget-xml-v2.c
- ${CMAKE_SOURCE_DIR}/src/backend/xml/gnc-lot-xml-v2.c
- ${CMAKE_SOURCE_DIR}/src/backend/xml/gnc-recurrence-xml-v2.c
- ${CMAKE_SOURCE_DIR}/src/backend/xml/gnc-schedxaction-xml-v2.c
- ${CMAKE_SOURCE_DIR}/src/backend/xml/gnc-freqspec-xml-v2.c
- ${CMAKE_SOURCE_DIR}/src/backend/xml/gnc-transaction-xml-v2.c
- ${CMAKE_SOURCE_DIR}/src/backend/xml/gnc-commodity-xml-v2.c
- ${CMAKE_SOURCE_DIR}/src/backend/xml/gnc-book-xml-v2.c
- ${CMAKE_SOURCE_DIR}/src/backend/xml/gnc-pricedb-xml-v2.c
+ ${CMAKE_SOURCE_DIR}/src/backend/xml/io-example-account.cpp
+ ${CMAKE_SOURCE_DIR}/src/backend/xml/io-gncxml-gen.cpp
+ ${CMAKE_SOURCE_DIR}/src/backend/xml/io-gncxml-v2.cpp
+ ${CMAKE_SOURCE_DIR}/src/backend/xml/io-utils.cpp
+ ${CMAKE_SOURCE_DIR}/src/backend/xml/gnc-account-xml-v2.cpp
+ ${CMAKE_SOURCE_DIR}/src/backend/xml/gnc-budget-xml-v2.cpp
+ ${CMAKE_SOURCE_DIR}/src/backend/xml/gnc-lot-xml-v2.cpp
+ ${CMAKE_SOURCE_DIR}/src/backend/xml/gnc-recurrence-xml-v2.cpp
+ ${CMAKE_SOURCE_DIR}/src/backend/xml/gnc-schedxaction-xml-v2.cpp
+ ${CMAKE_SOURCE_DIR}/src/backend/xml/gnc-freqspec-xml-v2.cpp
+ ${CMAKE_SOURCE_DIR}/src/backend/xml/gnc-transaction-xml-v2.cpp
+ ${CMAKE_SOURCE_DIR}/src/backend/xml/gnc-commodity-xml-v2.cpp
+ ${CMAKE_SOURCE_DIR}/src/backend/xml/gnc-book-xml-v2.cpp
+ ${CMAKE_SOURCE_DIR}/src/backend/xml/gnc-pricedb-xml-v2.cpp
)
-# The test test-dom-parser1.c is not run by Makefile.am
+# The test test-dom-parser1.cpp is not run by Makefile.am
-ADD_XML_TEST(test-date-converting "${test_backend_xml_base_SOURCES};test-date-converting.c")
-ADD_XML_TEST(test-dom-converters1 "${test_backend_xml_base_SOURCES};test-dom-converters1.c")
-ADD_XML_TEST(test-kvp-frames "${test_backend_xml_base_SOURCES};test-kvp-frames.c")
-ADD_XML_TEST(test-load-backend test-load-backend.c)
-ADD_XML_TEST(test-load-xml2 test-load-xml2.c
+ADD_XML_TEST(test-date-converting "${test_backend_xml_base_SOURCES};test-date-converting.cpp")
+ADD_XML_TEST(test-dom-converters1 "${test_backend_xml_base_SOURCES};test-dom-converters1.cpp")
+ADD_XML_TEST(test-kvp-frames "${test_backend_xml_base_SOURCES};test-kvp-frames.cpp")
+ADD_XML_TEST(test-load-backend test-load-backend.cpp)
+ADD_XML_TEST(test-load-xml2 test-load-xml2.cpp
GNC_TEST_FILES=${CMAKE_CURRENT_SOURCE_DIR}/test-files/xml2
)
# Not run in autotools.
-#ADD_XML_TEST(test-save-in-lang test-save-in-lang.c
+#ADD_XML_TEST(test-save-in-lang test-save-in-lang.cpp
# GNC_TEST_FILES=${CMAKE_CURRENT_SOURCE_DIR}/test-files/xml2
#)
GNC_ADD_TEST_WITH_GUILE(test-load-example-account
- "${test_backend_xml_module_SOURCES};test-load-example-account.c"
+ "${test_backend_xml_module_SOURCES};test-load-example-account.cpp"
XML_TEST_INCLUDE_DIRS XML_TEST_LIBS
GNC_ACCOUNT_PATH=${CMAKE_SOURCE_DIR}/accounts/C
)
-ADD_XML_TEST(test-string-converters "${test_backend_xml_base_SOURCES};test-string-converters.c")
-ADD_XML_TEST(test-xml-account "${test_backend_xml_module_SOURCES};test-xml-account.c;test-file-stuff.c")
-ADD_XML_TEST(test-xml-commodity "${test_backend_xml_module_SOURCES};test-xml-commodity.c;test-file-stuff.c")
-ADD_XML_TEST(test-xml-pricedb "${test_backend_xml_module_SOURCES};test-xml-pricedb.c;test-file-stuff.c")
-ADD_XML_TEST(test-xml-transaction "${test_backend_xml_module_SOURCES};test-xml-transaction.c;test-file-stuff.c")
-ADD_XML_TEST(test-xml2-is-file "${test_backend_xml_module_SOURCES};test-xml2-is-file.c"
+ADD_XML_TEST(test-string-converters "${test_backend_xml_base_SOURCES};test-string-converters.cpp")
+ADD_XML_TEST(test-xml-account "${test_backend_xml_module_SOURCES};test-xml-account.cpp;test-file-stuff.cpp")
+ADD_XML_TEST(test-xml-commodity "${test_backend_xml_module_SOURCES};test-xml-commodity.cpp;test-file-stuff.cpp")
+ADD_XML_TEST(test-xml-pricedb "${test_backend_xml_module_SOURCES};test-xml-pricedb.cpp;test-file-stuff.cpp")
+ADD_XML_TEST(test-xml-transaction "${test_backend_xml_module_SOURCES};test-xml-transaction.cpp;test-file-stuff.cpp")
+ADD_XML_TEST(test-xml2-is-file "${test_backend_xml_module_SOURCES};test-xml2-is-file.cpp"
GNC_TEST_FILES=${CMAKE_CURRENT_SOURCE_DIR}/test-files/xml2)
SET(CMAKE_COMMAND_TMP "")
diff --git a/src/bin/CMakeLists.txt b/src/bin/CMakeLists.txt
index aa24740..bf109c5 100644
--- a/src/bin/CMakeLists.txt
+++ b/src/bin/CMakeLists.txt
@@ -1,5 +1,5 @@
ADD_SUBDIRECTORY(overrides)
-#ADD_SUBDIRECTORY(test)
+ADD_SUBDIRECTORY(test)
# Some settings are platform dependent. Let's define them per platform.
IF (WIN32)
# Windows specific settings go here:
diff --git a/src/core-utils/CMakeLists.txt b/src/core-utils/CMakeLists.txt
index 2d52410..c5af60c 100644
--- a/src/core-utils/CMakeLists.txt
+++ b/src/core-utils/CMakeLists.txt
@@ -1,6 +1,6 @@
# CMakeLists.txt for src/core-utils
-#ADD_SUBDIRECTORY(test)
+ADD_SUBDIRECTORY(test)
# Command to generate the swig-engine.c wrapper file
SET (SWIG_CORE_UTILS_C ${CMAKE_CURRENT_BINARY_DIR}/swig-core-utils.c)
GNC_ADD_SWIG_COMMAND (${SWIG_CORE_UTILS_C} ${CMAKE_CURRENT_SOURCE_DIR}/core-utils.i)
diff --git a/src/engine/CMakeLists.txt b/src/engine/CMakeLists.txt
index 4d911f5..1b2781b 100644
--- a/src/engine/CMakeLists.txt
+++ b/src/engine/CMakeLists.txt
@@ -1,7 +1,7 @@
# CMakeLists.txt for src/engine
-#ADD_SUBDIRECTORY(test-core)
-#ADD_SUBDIRECTORY(test)
+ADD_SUBDIRECTORY(test-core)
+ADD_SUBDIRECTORY(test)
SET(engine_noinst_HEADERS
AccountP.h
diff --git a/src/engine/test-core/CMakeLists.txt b/src/engine/test-core/CMakeLists.txt
index d5b7790..20aa85d 100644
--- a/src/engine/test-core/CMakeLists.txt
+++ b/src/engine/test-core/CMakeLists.txt
@@ -1,7 +1,7 @@
SET(libgncmod_test_engine_SOURCES
- gncmod-test-engine.c test-engine-stuff.c
+ gncmod-test-engine.c test-engine-stuff.cpp
)
ADD_LIBRARY(gncmod-test-engine STATIC ${libgncmod_test_engine_SOURCES})
diff --git a/src/engine/test/CMakeLists.txt b/src/engine/test/CMakeLists.txt
index b66c1bc..bc13862 100644
--- a/src/engine/test/CMakeLists.txt
+++ b/src/engine/test/CMakeLists.txt
@@ -26,33 +26,35 @@ ADD_DEPENDENCIES(check test-link)
#################################################
ADD_ENGINE_TEST(test-load-engine test-load-engine.c)
-ADD_ENGINE_TEST(test-guid test-guid.c)
-ADD_ENGINE_TEST(test-numeric test-numeric.c)
-ADD_ENGINE_TEST(test-date test-date.c)
+ADD_ENGINE_TEST(test-guid test-guid.cpp)
+ADD_ENGINE_TEST(test-numeric test-numeric.cpp)
+ADD_ENGINE_TEST(test-date test-date.cpp)
ADD_ENGINE_TEST(test-object test-object.c)
-ADD_ENGINE_TEST(test-commodities test-commodities.c)
+ADD_ENGINE_TEST(test-commodities test-commodities.cpp)
SET(test_engine_SOURCES
test-engine.c
- utest-Account.c
+ utest-Account.cpp
utest-Budget.c
utest-Entry.c
utest-Invoice.c
- utest-Split.c
- utest-Transaction.c
+ utest-Split.cpp
+ utest-Transaction.cpp
+ test-engine-kvp-properties.c
+ utest-gnc-pricedb.c
)
ADD_ENGINE_TEST(test-engine "${test_engine_SOURCES}")
TARGET_COMPILE_OPTIONS(test-engine PRIVATE -Wno-write-strings)
-ADD_ENGINE_TEST(test-account-object test-account-object.c)
-ADD_ENGINE_TEST(test-group-vs-book test-group-vs-book.c)
-ADD_ENGINE_TEST(test-lots test-lots.c)
+ADD_ENGINE_TEST(test-account-object test-account-object.cpp)
+ADD_ENGINE_TEST(test-group-vs-book test-group-vs-book.cpp)
+ADD_ENGINE_TEST(test-lots test-lots.cpp)
ADD_ENGINE_TEST(test-querynew test-querynew.c)
-ADD_ENGINE_TEST(test-query test-query.c)
-ADD_ENGINE_TEST(test-split-vs-account test-split-vs-account.c)
-ADD_ENGINE_TEST(test-transaction-reversal test-transaction-reversal.c)
-ADD_ENGINE_TEST(test-transaction-voiding test-transaction-voiding.c)
+ADD_ENGINE_TEST(test-query test-query.cpp)
+ADD_ENGINE_TEST(test-split-vs-account test-split-vs-account.cpp)
+ADD_ENGINE_TEST(test-transaction-reversal test-transaction-reversal.cpp)
+ADD_ENGINE_TEST(test-transaction-voiding test-transaction-voiding.cpp)
ADD_ENGINE_TEST(test-recurrence test-recurrence.c)
ADD_ENGINE_TEST(test-business test-business.c)
ADD_ENGINE_TEST(test-address test-address.c)
@@ -63,7 +65,7 @@ ADD_ENGINE_TEST(test-vendor test-vendor.c)
############################
# This is a C test that needs GUILE environment variables set.
-GNC_ADD_TEST_WITH_GUILE(test-scm-query test-scm-query.c ENGINE_TEST_INCLUDE_DIRS ENGINE_TEST_LIBS)
+GNC_ADD_TEST_WITH_GUILE(test-scm-query test-scm-query.cpp ENGINE_TEST_INCLUDE_DIRS ENGINE_TEST_LIBS)
############################
GNC_ADD_SCHEME_TEST(scm-test-account test-account.scm)
diff --git a/src/gnc-module/CMakeLists.txt b/src/gnc-module/CMakeLists.txt
index ebad85a..0863fd3 100644
--- a/src/gnc-module/CMakeLists.txt
+++ b/src/gnc-module/CMakeLists.txt
@@ -1,5 +1,5 @@
# CMakeLists.txt for src/gnc-module
-#ADD_SUBDIRECTORY(test)
+ADD_SUBDIRECTORY(test)
# Command to generate the swig-engine.c wrapper file
SET (SWIG_GNC_MODULE_C ${CMAKE_CURRENT_BINARY_DIR}/swig-gnc-module.c)
diff --git a/src/gnome-utils/CMakeLists.txt b/src/gnome-utils/CMakeLists.txt
index cc60e44..c69c254 100644
--- a/src/gnome-utils/CMakeLists.txt
+++ b/src/gnome-utils/CMakeLists.txt
@@ -3,7 +3,7 @@
ADD_SUBDIRECTORY(gschemas)
ADD_SUBDIRECTORY(gtkbuilder)
ADD_SUBDIRECTORY(ui)
-#ADD_SUBDIRECTORY(test)
+ADD_SUBDIRECTORY(test)
SET (SWIG_GNOME_UTILS_C ${CMAKE_CURRENT_BINARY_DIR}/swig-gnome-utils.c)
GNC_ADD_SWIG_COMMAND (${SWIG_GNOME_UTILS_C} ${CMAKE_CURRENT_SOURCE_DIR}/gnome-utils.i)
diff --git a/src/import-export/CMakeLists.txt b/src/import-export/CMakeLists.txt
index ca1c1e7..281a3cf 100644
--- a/src/import-export/CMakeLists.txt
+++ b/src/import-export/CMakeLists.txt
@@ -1,6 +1,6 @@
# CMakeLists.txt for src/import-export
-#ADD_SUBDIRECTORY(test)
+ADD_SUBDIRECTORY(test)
# ############################################################
IF (WITH_AQBANKING)
diff --git a/src/import-export/csv-imp/CMakeLists.txt b/src/import-export/csv-imp/CMakeLists.txt
index f946e19..7f90114 100644
--- a/src/import-export/csv-imp/CMakeLists.txt
+++ b/src/import-export/csv-imp/CMakeLists.txt
@@ -1,5 +1,5 @@
ADD_SUBDIRECTORY(gschemas)
-#ADD_SUBDIRECTORY(test)
+ADD_SUBDIRECTORY(test)
SET(csv_import_SOURCES
gncmod-csv-import.c
diff --git a/src/import-export/ofx/CMakeLists.txt b/src/import-export/ofx/CMakeLists.txt
index 0edd5b6..e9dcf26 100644
--- a/src/import-export/ofx/CMakeLists.txt
+++ b/src/import-export/ofx/CMakeLists.txt
@@ -1,5 +1,5 @@
ADD_SUBDIRECTORY(gschemas)
-#ADD_SUBDIRECTORY(test)
+ADD_SUBDIRECTORY(test)
SET(ofx_SOURCES
gnc-ofx-import.c
diff --git a/src/import-export/qif-imp/CMakeLists.txt b/src/import-export/qif-imp/CMakeLists.txt
index 6baeda7..13a15d5 100644
--- a/src/import-export/qif-imp/CMakeLists.txt
+++ b/src/import-export/qif-imp/CMakeLists.txt
@@ -1,7 +1,7 @@
# CMakeLists.txt for src/import_export/qif-imp
ADD_SUBDIRECTORY(gschemas)
-#ADD_SUBDIRECTORY(test)
+ADD_SUBDIRECTORY(test)
SET (qif_import_SOURCES
dialog-account-picker.c
diff --git a/src/import-export/qif/CMakeLists.txt b/src/import-export/qif/CMakeLists.txt
index 94114e3..6c9ee11 100644
--- a/src/import-export/qif/CMakeLists.txt
+++ b/src/import-export/qif/CMakeLists.txt
@@ -1,6 +1,6 @@
#Tests for this directory are not run.
-##ADD_SUBDIRECTORY(test)
+#ADD_SUBDIRECTORY(test)
SET(qif_SOURCES
qif-context.c
diff --git a/src/libqof/CMakeLists.txt b/src/libqof/CMakeLists.txt
index 100a9a9..75831b3 100644
--- a/src/libqof/CMakeLists.txt
+++ b/src/libqof/CMakeLists.txt
@@ -1,6 +1,6 @@
# CMakeLists.txt for src/libqof
-#ADD_SUBDIRECTORY(qof/test)
+ADD_SUBDIRECTORY(qof/test)
SET (gnc_qof_HEADERS
qof/gnc-aqbanking-templates.h
diff --git a/src/libqof/qof/test/CMakeLists.txt b/src/libqof/qof/test/CMakeLists.txt
index 61fdc68..a160910 100644
--- a/src/libqof/qof/test/CMakeLists.txt
+++ b/src/libqof/qof/test/CMakeLists.txt
@@ -14,11 +14,12 @@ SET(test_qof_SOURCES
test-gnc-date.c
test-qof.c
test-qofbook.c
- test-qofinstance.c
- test-kvp_frame.c
+ test-qofinstance.cpp
+# test-kvp-frame.cpp This now use Google Test
test-qofobject.c
test-qofsession.c
test-qof-string-cache.c
+ test-gnc-guid.cpp
${CMAKE_SOURCE_DIR}/src/test-core/unittest-support.c
)
diff --git a/src/register/ledger-core/CMakeLists.txt b/src/register/ledger-core/CMakeLists.txt
index f72dd78..fb2edfa 100644
--- a/src/register/ledger-core/CMakeLists.txt
+++ b/src/register/ledger-core/CMakeLists.txt
@@ -1,5 +1,5 @@
-#ADD_SUBDIRECTORY(test)
+ADD_SUBDIRECTORY(test)
SET (ledger_core_SOURCES
gnc-ledger-display.c
diff --git a/src/register/register-core/CMakeLists.txt b/src/register/register-core/CMakeLists.txt
index 0407a1f..050cc36 100644
--- a/src/register/register-core/CMakeLists.txt
+++ b/src/register/register-core/CMakeLists.txt
@@ -1,4 +1,4 @@
-#ADD_SUBDIRECTORY(test)
+ADD_SUBDIRECTORY(test)
SET (register_core_SOURCES
gncmod-register-core.c
diff --git a/src/register/register-gnome/CMakeLists.txt b/src/register/register-gnome/CMakeLists.txt
index f3fe444..1ce703c 100644
--- a/src/register/register-gnome/CMakeLists.txt
+++ b/src/register/register-gnome/CMakeLists.txt
@@ -1,4 +1,4 @@
-#ADD_SUBDIRECTORY(test)
+ADD_SUBDIRECTORY(test)
SET (register_gnome_SOURCES
gncmod-register-gnome.c
diff --git a/src/report/locale-specific/us/CMakeLists.txt b/src/report/locale-specific/us/CMakeLists.txt
index c0da971..e37d850 100644
--- a/src/report/locale-specific/us/CMakeLists.txt
+++ b/src/report/locale-specific/us/CMakeLists.txt
@@ -1,4 +1,4 @@
-#ADD_SUBDIRECTORY(test)
+ADD_SUBDIRECTORY(test)
SET(locale_reports_us_SOURCES
gncmod-locale-reports-us.c
diff --git a/src/report/report-gnome/CMakeLists.txt b/src/report/report-gnome/CMakeLists.txt
index 94ef547..3d63050 100644
--- a/src/report/report-gnome/CMakeLists.txt
+++ b/src/report/report-gnome/CMakeLists.txt
@@ -1,4 +1,4 @@
-#ADD_SUBDIRECTORY(test)
+ADD_SUBDIRECTORY(test)
SET (report_gnome_HEADERS
dialog-report-column-view.h
diff --git a/src/report/report-system/CMakeLists.txt b/src/report/report-system/CMakeLists.txt
index 1c4b314..74bffc7 100644
--- a/src/report/report-system/CMakeLists.txt
+++ b/src/report/report-system/CMakeLists.txt
@@ -1,4 +1,4 @@
-#ADD_SUBDIRECTORY(test)
+ADD_SUBDIRECTORY(test)
SET (report_system_HEADERS
gnc-report.h
diff --git a/src/report/standard-reports/CMakeLists.txt b/src/report/standard-reports/CMakeLists.txt
index 8a35848..cbd7fc0 100644
--- a/src/report/standard-reports/CMakeLists.txt
+++ b/src/report/standard-reports/CMakeLists.txt
@@ -1,5 +1,5 @@
-#ADD_SUBDIRECTORY(test)
+ADD_SUBDIRECTORY(test)
SET(standard_reports_SOURCES gncmod-standard-reports.c)
diff --git a/src/report/stylesheets/CMakeLists.txt b/src/report/stylesheets/CMakeLists.txt
index 5ceba71..67f09d7 100644
--- a/src/report/stylesheets/CMakeLists.txt
+++ b/src/report/stylesheets/CMakeLists.txt
@@ -1,4 +1,4 @@
-#ADD_SUBDIRECTORY(test)
+ADD_SUBDIRECTORY(test)
SET(stylesheets_SOURCES
gnc-plugin-stylesheets.c
diff --git a/src/report/utility-reports/CMakeLists.txt b/src/report/utility-reports/CMakeLists.txt
index 66c73ca..b8857f2 100644
--- a/src/report/utility-reports/CMakeLists.txt
+++ b/src/report/utility-reports/CMakeLists.txt
@@ -1,4 +1,4 @@
-#ADD_SUBDIRECTORY(test)
+ADD_SUBDIRECTORY(test)
SET(utility_reports_SOURCES
gncmod-utility-reports.c
diff --git a/src/tax/us/CMakeLists.txt b/src/tax/us/CMakeLists.txt
index 514a9ae..fe4eec7 100644
--- a/src/tax/us/CMakeLists.txt
+++ b/src/tax/us/CMakeLists.txt
@@ -1,4 +1,4 @@
-#ADD_SUBDIRECTORY(test)
+ADD_SUBDIRECTORY(test)
SET(tax_us_SOURCES gncmod-tax-us.c)
Summary of changes:
CMakeLists.txt | 50 ++++++++++----------
src/app-utils/CMakeLists.txt | 2 +-
src/app-utils/test/CMakeLists.txt | 8 ++--
src/backend/dbi/CMakeLists.txt | 2 +-
src/backend/dbi/test/CMakeLists.txt | 8 ++--
src/backend/sql/CMakeLists.txt | 2 +-
src/backend/sql/test/CMakeLists.txt | 4 +-
src/backend/xml/CMakeLists.txt | 2 +-
src/backend/xml/test/CMakeLists.txt | 70 ++++++++++++++--------------
src/bin/CMakeLists.txt | 2 +-
src/core-utils/CMakeLists.txt | 2 +-
src/engine/CMakeLists.txt | 4 +-
src/engine/test-core/CMakeLists.txt | 2 +-
src/engine/test/CMakeLists.txt | 32 +++++++------
src/gnc-module/CMakeLists.txt | 2 +-
src/gnome-utils/CMakeLists.txt | 2 +-
src/import-export/CMakeLists.txt | 2 +-
src/import-export/csv-imp/CMakeLists.txt | 2 +-
src/import-export/ofx/CMakeLists.txt | 2 +-
src/import-export/qif-imp/CMakeLists.txt | 2 +-
src/import-export/qif/CMakeLists.txt | 2 +-
src/libqof/CMakeLists.txt | 2 +-
src/libqof/qof/test/CMakeLists.txt | 5 +-
src/register/ledger-core/CMakeLists.txt | 2 +-
src/register/register-core/CMakeLists.txt | 2 +-
src/register/register-gnome/CMakeLists.txt | 2 +-
src/report/locale-specific/us/CMakeLists.txt | 2 +-
src/report/report-gnome/CMakeLists.txt | 2 +-
src/report/report-system/CMakeLists.txt | 2 +-
src/report/standard-reports/CMakeLists.txt | 2 +-
src/report/stylesheets/CMakeLists.txt | 2 +-
src/report/utility-reports/CMakeLists.txt | 2 +-
src/tax/us/CMakeLists.txt | 2 +-
33 files changed, 117 insertions(+), 114 deletions(-)
More information about the gnucash-changes
mailing list