Lowercase cmake commands

A huge bikeshed fest but it distracted me enough to do it anyway.
2025-02-25 18:55:30 -06:00 · 2018-05-03 23:18:15 +02:00
parent 65c7139072
commit a9f35ed7ae
154 changed files with 2546 additions and 2565 deletions
--- a/libgnucash/backend/CMakeLists.txt
+++ b/libgnucash/backend/CMakeLists.txt
@@ -1,9 +1,9 @@

-ADD_SUBDIRECTORY(xml)
-ADD_SUBDIRECTORY (dbi)
-ADD_SUBDIRECTORY (sql)
+add_subdirectory(xml)
+add_subdirectory (dbi)
+add_subdirectory (sql)



-SET_LOCAL_DIST(backend_DIST_local CMakeLists.txt )
-SET(backend_DIST ${backend_DIST_local} ${backend_dbi_DIST} ${backend_sql_DIST} ${backend_xml_DIST} PARENT_SCOPE)
+set_local_dist(backend_DIST_local CMakeLists.txt )
+set(backend_DIST ${backend_DIST_local} ${backend_dbi_DIST} ${backend_sql_DIST} ${backend_xml_DIST} PARENT_SCOPE)
--- a/libgnucash/backend/dbi/CMakeLists.txt
+++ b/libgnucash/backend/dbi/CMakeLists.txt
@@ -1,13 +1,13 @@
 # CMakeLists.txt for libgnucash/backend/dbi

-ADD_SUBDIRECTORY(test)
+add_subdirectory(test)

-SET (backend_dbi_SOURCES
+set (backend_dbi_SOURCES
  gnc-backend-dbi.cpp
  gnc-dbisqlresult.cpp
  gnc-dbisqlconnection.cpp
 )
-SET (backend_dbi_noinst_HEADERS
+set (backend_dbi_noinst_HEADERS
  gnc-backend-dbi.h
  gnc-backend-dbi.hpp
  gnc-dbisqlresult.hpp
@@ -16,36 +16,36 @@ SET (backend_dbi_noinst_HEADERS
  gnc-dbiproviderimpl.hpp
 )

-SET_LOCAL_DIST(backend_dbi_DIST_local
+set_local_dist(backend_dbi_DIST_local
        ${backend_dbi_SOURCES} ${backend_dbi_noinst_HEADERS} CMakeLists.txt )
-SET(backend_dbi_DIST ${backend_dbi_DIST_local} ${test_dbi_backend_DIST} PARENT_SCOPE)
+set(backend_dbi_DIST ${backend_dbi_DIST_local} ${test_dbi_backend_DIST} PARENT_SCOPE)

 # Add dependency on config.h
-SET_SOURCE_FILES_PROPERTIES (${backend_dbi_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})
+set_source_files_properties (${backend_dbi_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})

-IF (WITH_SQL)
-  ADD_LIBRARY (gncmod-backend-dbi
+if (WITH_SQL)
+  add_library (gncmod-backend-dbi
    ${backend_dbi_SOURCES}
    ${backend_dbi_noinst_HEADERS}
  )

-  SET(WINSOCK_LIB "")
-  IF(MINGW64)
-    SET(WINSOCK_LIB "-lws2_32")
-  ENDIF(MINGW64)
-  TARGET_LINK_LIBRARIES(gncmod-backend-dbi gnc-backend-sql gncmod-engine ${GTK2_LDFLAGS} ${Boost_REGEX_LIBRARY} ${LIBDBI_LIBRARY} ${WINSOCK_LIB})
+  set(WINSOCK_LIB "")
+  if(MINGW64)
+    set(WINSOCK_LIB "-lws2_32")
+  endif(MINGW64)
+  target_link_libraries(gncmod-backend-dbi gnc-backend-sql gncmod-engine ${GTK2_LDFLAGS} ${Boost_REGEX_LIBRARY} ${LIBDBI_LIBRARY} ${WINSOCK_LIB})

-  TARGET_COMPILE_DEFINITIONS(gncmod-backend-dbi PRIVATE -DG_LOG_DOMAIN=\"gnc.backend.dbi\")
+  target_compile_definitions(gncmod-backend-dbi PRIVATE -DG_LOG_DOMAIN=\"gnc.backend.dbi\")

-  TARGET_INCLUDE_DIRECTORIES(gncmod-backend-dbi PRIVATE ${LIBDBI_INCLUDE_PATH})
+  target_include_directories(gncmod-backend-dbi PRIVATE ${LIBDBI_INCLUDE_PATH})

-  IF (APPLE)
-    SET_TARGET_PROPERTIES (gncmod-backend-dbi PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
-  ENDIF()
+  if (APPLE)
+    set_target_properties (gncmod-backend-dbi PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
+  endif()

-  INSTALL(TARGETS gncmod-backend-dbi
+  install(TARGETS gncmod-backend-dbi
    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 # No headers to install
-ENDIF(WITH_SQL)
+endif(WITH_SQL)
--- a/libgnucash/backend/dbi/test/CMakeLists.txt
+++ b/libgnucash/backend/dbi/test/CMakeLists.txt
@@ -1,5 +1,5 @@

-SET(BACKEND_DBI_TEST_INCLUDE_DIRS
+set(BACKEND_DBI_TEST_INCLUDE_DIRS
  ${CMAKE_BINARY_DIR}/common # for config.h
  ${CMAKE_SOURCE_DIR}/libgnucash/core-utils
  ${CMAKE_SOURCE_DIR}/libgnucash/backend/dbi/test
@@ -10,9 +10,9 @@ SET(BACKEND_DBI_TEST_INCLUDE_DIRS
  ${LIBDBI_INCLUDE_PATH}
  ${GLIB2_INCLUDE_DIRS}
 )
-SET(BACKEND_DBI_TEST_LIBS gnc-backend-sql gncmod-engine gncmod-test-engine test-core ${Boost_REGEX_LIBRARY} ${LIBDBI_LIBRARY})
+set(BACKEND_DBI_TEST_LIBS gnc-backend-sql gncmod-engine gncmod-test-engine test-core ${Boost_REGEX_LIBRARY} ${LIBDBI_LIBRARY})

-SET(test_dbi_backend_SOURCES
+set(test_dbi_backend_SOURCES
  test-backend-dbi.cpp
  test-backend-dbi-basic.cpp
  test-dbi-business-stuff.cpp
@@ -22,19 +22,19 @@ SET(test_dbi_backend_SOURCES
  ../gnc-dbisqlresult.cpp
 )

-SET(test_dbi_backend_HEADERS test-dbi-business-stuff.h test-dbi-stuff.h)
+set(test_dbi_backend_HEADERS test-dbi-business-stuff.h test-dbi-stuff.h)

-SET_DIST_LIST(test_dbi_backend_DIST ${test_dbi_backend_SOURCES} ${test_dbi_backend_HEADERS} test-dbi.xml CMakeLists.txt )
+set_dist_list(test_dbi_backend_DIST ${test_dbi_backend_SOURCES} ${test_dbi_backend_HEADERS} test-dbi.xml CMakeLists.txt )

 # This test does not work on Win32
-IF (WITH_SQL AND NOT WIN32)
-  GNC_ADD_TEST(test-backend-dbi "${test_dbi_backend_SOURCES}"
+if (WITH_SQL AND NOT WIN32)
+  gnc_add_test(test-backend-dbi "${test_dbi_backend_SOURCES}"
    BACKEND_DBI_TEST_INCLUDE_DIRS BACKEND_DBI_TEST_LIBS
  )

-  TARGET_COMPILE_DEFINITIONS(test-backend-dbi PRIVATE
+  target_compile_definitions(test-backend-dbi PRIVATE
    TEST_MYSQL_URL=\"${TEST_MYSQL_URL}\"
    TEST_PGSQL_URL=\"${TEST_PGSQL_URL}\"
    DBI_TEST_XML_FILENAME=\"${CMAKE_CURRENT_SOURCE_DIR}/test-dbi.xml\"
  )
-ENDIF()
+endif()
--- a/libgnucash/backend/sql/CMakeLists.txt
+++ b/libgnucash/backend/sql/CMakeLists.txt
@@ -1,8 +1,8 @@
 # CMakeLists.txt for libgnucash/backend/dbi

-ADD_SUBDIRECTORY(test)
+add_subdirectory(test)

-SET (backend_sql_SOURCES
+set (backend_sql_SOURCES
  gnc-account-sql.cpp
  gnc-address-sql.cpp
  gnc-bill-term-sql.cpp
@@ -30,7 +30,7 @@ SET (backend_sql_SOURCES
  gnc-sql-object-backend.cpp
  escape.cpp
 )
-SET (backend_sql_noinst_HEADERS
+set (backend_sql_noinst_HEADERS
  gnc-account-sql.h
  gnc-bill-term-sql.h
  gnc-book-sql.h
@@ -58,27 +58,27 @@ SET (backend_sql_noinst_HEADERS
  escape.h
 )

-SET_LOCAL_DIST(backend_sql_DIST_local ${backend_sql_SOURCES} ${backend_sql_noinst_HEADERS} CMakeLists.txt )
-SET(backend_sql_DIST ${backend_sql_DIST_local} ${test_backend_sql_DIST} PARENT_SCOPE)
+set_local_dist(backend_sql_DIST_local ${backend_sql_SOURCES} ${backend_sql_noinst_HEADERS} CMakeLists.txt )
+set(backend_sql_DIST ${backend_sql_DIST_local} ${test_backend_sql_DIST} PARENT_SCOPE)

 # Add dependency on config.h
-SET_SOURCE_FILES_PROPERTIES (${gnc_backend_sql_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})
-IF(WITH_SQL)
-  ADD_LIBRARY (gnc-backend-sql
+set_source_files_properties (${gnc_backend_sql_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})
+if(WITH_SQL)
+  add_library (gnc-backend-sql
    ${backend_sql_SOURCES}
    ${backend_sql_noinst_HEADERS}
    )

-  TARGET_LINK_LIBRARIES(gnc-backend-sql gncmod-engine)
+  target_link_libraries(gnc-backend-sql gncmod-engine)

-  TARGET_COMPILE_DEFINITIONS (gnc-backend-sql PRIVATE -DG_LOG_DOMAIN=\"gnc.backend.sql\")
+  target_compile_definitions (gnc-backend-sql PRIVATE -DG_LOG_DOMAIN=\"gnc.backend.sql\")

-  TARGET_INCLUDE_DIRECTORIES(gnc-backend-sql PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+  target_include_directories(gnc-backend-sql PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})

-  INSTALL(TARGETS gnc-backend-sql
+  install(TARGETS gnc-backend-sql
    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

  # No headers to install
-ENDIF(WITH_SQL)
+endif(WITH_SQL)
--- a/libgnucash/backend/sql/test/CMakeLists.txt
+++ b/libgnucash/backend/sql/test/CMakeLists.txt
@@ -1,5 +1,5 @@

-SET(BACKEND_SQL_TEST_INCLUDE_DIRS
+set(BACKEND_SQL_TEST_INCLUDE_DIRS
  ${CMAKE_BINARY_DIR}/common # for config.h
  ${CMAKE_SOURCE_DIR}/libgnucash/backend/sql
  ${CMAKE_SOURCE_DIR}/libgnucash/engine
@@ -7,21 +7,21 @@ SET(BACKEND_SQL_TEST_INCLUDE_DIRS
  ${GLIB2_INCLUDE_DIRS}
 )

-SET(test_backend_sql_SOURCES test-sqlbe.cpp utest-gnc-backend-sql.cpp)
+set(test_backend_sql_SOURCES test-sqlbe.cpp utest-gnc-backend-sql.cpp)

-SET(BACKEND_SQL_TEST_LIBS gnc-backend-sql gncmod-engine test-core)
+set(BACKEND_SQL_TEST_LIBS gnc-backend-sql gncmod-engine test-core)

-SET_DIST_LIST(test_backend_sql_DIST ${test_backend_sql_SOURCES} CMakeLists.txt
+set_dist_list(test_backend_sql_DIST ${test_backend_sql_SOURCES} CMakeLists.txt
  test-column-types.cpp)

-IF(WITH_SQL)
+if(WITH_SQL)
  # This test does not actually do anything.
-  GNC_ADD_TEST(test-column-types test-column-types.cpp
+  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_backend_sql_SOURCES}"
+  gnc_add_test(test-sqlbe "${test_backend_sql_SOURCES}"
    BACKEND_SQL_TEST_INCLUDE_DIRS BACKEND_SQL_TEST_LIBS
  )
-  TARGET_COMPILE_DEFINITIONS(test-sqlbe PRIVATE TESTPROG=test_sqlbe)
-ENDIF(WITH_SQL)
+  target_compile_definitions(test-sqlbe PRIVATE TESTPROG=test_sqlbe)
+endif(WITH_SQL)
--- a/libgnucash/backend/xml/CMakeLists.txt
+++ b/libgnucash/backend/xml/CMakeLists.txt
@@ -1,8 +1,8 @@
 # CMakeLists.txt for libgnucash/backend/xml

-ADD_SUBDIRECTORY(test)
+add_subdirectory(test)

-SET (backend_xml_utils_noinst_HEADERS
+set (backend_xml_utils_noinst_HEADERS
  gnc-backend-xml.h
  gnc-xml.h
  gnc-address-xml-v2.h
@@ -32,7 +32,7 @@ SET (backend_xml_utils_noinst_HEADERS
  xml-helpers.h
 )

-SET (backend_xml_utils_SOURCES
+set (backend_xml_utils_SOURCES
  gnc-account-xml-v2.cpp
  gnc-address-xml-v2.cpp
  gnc-bill-term-xml-v2.cpp
@@ -69,29 +69,29 @@ SET (backend_xml_utils_SOURCES
  sixtp.cpp
 )

-SET_LOCAL_DIST(backend_xml_DIST_local ${backend_xml_utils_SOURCES}
+set_local_dist(backend_xml_DIST_local ${backend_xml_utils_SOURCES}
  ${backend_xml_utils_noinst_HEADERS} gnc-backend-xml.cpp CMakeLists.txt
  )
-SET(backend_xml_DIST ${backend_xml_DIST_local} ${test_backend_xml_DIST} PARENT_SCOPE)
+set(backend_xml_DIST ${backend_xml_DIST_local} ${test_backend_xml_DIST} PARENT_SCOPE)

 # Add dependency on config.h
-SET_SOURCE_FILES_PROPERTIES (${backend_xml_utils_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})
+set_source_files_properties (${backend_xml_utils_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})

-ADD_LIBRARY	(gnc-backend-xml-utils
+add_library	(gnc-backend-xml-utils
  ${backend_xml_utils_SOURCES}
  ${backend_xml_utils_noinst_HEADERS}
 )

-TARGET_LINK_LIBRARIES(gnc-backend-xml-utils gncmod-engine ${LIBXML2_LDFLAGS} ${ZLIB_LDFLAGS})
+target_link_libraries(gnc-backend-xml-utils gncmod-engine ${LIBXML2_LDFLAGS} ${ZLIB_LDFLAGS})

-TARGET_INCLUDE_DIRECTORIES (gnc-backend-xml-utils
+target_include_directories (gnc-backend-xml-utils
  PUBLIC  ${LIBXML2_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}
  PRIVATE ${ZLIB_INCLUDE_DIRS}
 )

-TARGET_COMPILE_DEFINITIONS (gnc-backend-xml-utils PRIVATE -DG_LOG_DOMAIN=\"gnc.backend.xml\" -DU_SHOW_CPLUSPLUS_API=0)
+target_compile_definitions (gnc-backend-xml-utils PRIVATE -DG_LOG_DOMAIN=\"gnc.backend.xml\" -DU_SHOW_CPLUSPLUS_API=0)

-INSTALL(TARGETS gnc-backend-xml-utils
+install(TARGETS gnc-backend-xml-utils
  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
@@ -99,27 +99,27 @@ INSTALL(TARGETS gnc-backend-xml-utils

 # ----

-SET(libgncmod_backend_xml_SOURCES gnc-backend-xml.cpp)
+set(libgncmod_backend_xml_SOURCES gnc-backend-xml.cpp)

-SET_SOURCE_FILES_PROPERTIES (${libgncmod_backend_xml_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})
+set_source_files_properties (${libgncmod_backend_xml_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})

-ADD_LIBRARY(gncmod-backend-xml MODULE ${libgncmod_backend_xml_SOURCES})
-TARGET_LINK_LIBRARIES(gncmod-backend-xml gnc-backend-xml-utils gncmod-engine
+add_library(gncmod-backend-xml MODULE ${libgncmod_backend_xml_SOURCES})
+target_link_libraries(gncmod-backend-xml gnc-backend-xml-utils gncmod-engine
                        gnc-core-utils ${LIBXML2_LDFLAGS} ${GLIB2_LDFLAGS} ${ZLIB_LIBRARY})

-TARGET_COMPILE_DEFINITIONS (gncmod-backend-xml PRIVATE -DG_LOG_DOMAIN=\"gnc.backend.xml\" -DU_SHOW_CPLUSPLUS_API=0)
+target_compile_definitions (gncmod-backend-xml PRIVATE -DG_LOG_DOMAIN=\"gnc.backend.xml\" -DU_SHOW_CPLUSPLUS_API=0)

-SET(LIB_DIR ${CMAKE_INSTALL_LIBDIR}/gnucash)
-IF (WIN32)
-  SET(LIB_DIR ${CMAKE_INSTALL_BINDIR})
-ENDIF(WIN32)
+set(LIB_DIR ${CMAKE_INSTALL_LIBDIR}/gnucash)
+if (WIN32)
+  set(LIB_DIR ${CMAKE_INSTALL_BINDIR})
+endif(WIN32)


-IF (APPLE)
-  SET_TARGET_PROPERTIES (gncmod-backend-xml PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}")
-ENDIF()
+if (APPLE)
+  set_target_properties (gncmod-backend-xml PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}")
+endif()

-INSTALL(TARGETS gncmod-backend-xml
+install(TARGETS gncmod-backend-xml
  LIBRARY DESTINATION ${LIB_DIR}
  ARCHIVE DESTINATION ${LIB_DIR}
  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
@@ -127,7 +127,7 @@ INSTALL(TARGETS gncmod-backend-xml
 # ----

 # Special normal (non-MODULE) library for cutecash only
-ADD_LIBRARY(gncmod-backend-xml-utils ${libgncmod_backend_xml_SOURCES})
-TARGET_LINK_LIBRARIES(gncmod-backend-xml-utils gnc-backend-xml-utils gncmod-engine
+add_library(gncmod-backend-xml-utils ${libgncmod_backend_xml_SOURCES})
+target_link_libraries(gncmod-backend-xml-utils gnc-backend-xml-utils gncmod-engine
                        gnc-core-utils ${LIBXML2_LDFLAGS} ${GLIB2_LDFLAGS} ${ZLIB_LIBRARY})
-TARGET_COMPILE_DEFINITIONS (gncmod-backend-xml-utils PRIVATE -DG_LOG_DOMAIN=\"gnc.backend.xml\" -DU_SHOW_CPLUSPLUS_API=0)
+target_compile_definitions (gncmod-backend-xml-utils PRIVATE -DG_LOG_DOMAIN=\"gnc.backend.xml\" -DU_SHOW_CPLUSPLUS_API=0)
--- a/libgnucash/backend/xml/test/CMakeLists.txt
+++ b/libgnucash/backend/xml/test/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Common stuff
-ADD_SUBDIRECTORY(test-files)
+add_subdirectory(test-files)

-SET(XML_TEST_INCLUDE_DIRS
+set(XML_TEST_INCLUDE_DIRS
  ${CMAKE_SOURCE_DIR}/libgnucash/backend/xml
  ${CMAKE_SOURCE_DIR}/libgnucash/backend/xml/test
  ${CMAKE_SOURCE_DIR}/libgnucash/engine
@@ -14,17 +14,17 @@ SET(XML_TEST_INCLUDE_DIRS
 )


-SET(XML_TEST_LIBS gncmod-engine gncmod-test-engine test-core ${LIBXML2_LDFLAGS} -lz)
+set(XML_TEST_LIBS gncmod-engine gncmod-test-engine test-core ${LIBXML2_LDFLAGS} -lz)

-FUNCTION(ADD_XML_TEST _TARGET _SOURCE_FILES)
-  GNC_ADD_TEST(${_TARGET} "${_SOURCE_FILES}" XML_TEST_INCLUDE_DIRS XML_TEST_LIBS ${ARGN})
-  TARGET_COMPILE_OPTIONS(${_TARGET} PRIVATE -DU_SHOW_CPLUSPLUS_API=0)
-ENDFUNCTION()
+function(add_xml_test _TARGET _SOURCE_FILES)
+  gnc_add_test(${_TARGET} "${_SOURCE_FILES}" XML_TEST_INCLUDE_DIRS XML_TEST_LIBS ${ARGN})
+  target_compile_options(${_TARGET} PRIVATE -DU_SHOW_CPLUSPLUS_API=0)
+endfunction()


 ################################

-SET(test_backend_xml_base_SOURCES
+set(test_backend_xml_base_SOURCES
  ${CMAKE_SOURCE_DIR}/libgnucash/backend/xml/sixtp-dom-parsers.cpp
  ${CMAKE_SOURCE_DIR}/libgnucash/backend/xml/sixtp-dom-generators.cpp
  ${CMAKE_SOURCE_DIR}/libgnucash/backend/xml/sixtp-utils.cpp
@@ -38,7 +38,7 @@ SET(test_backend_xml_base_SOURCES
 ## not load it as a module and cannot link to it
 ## and remain portable.

-SET(test_backend_xml_module_SOURCES
+set(test_backend_xml_module_SOURCES
  ${test_backend_xml_base_SOURCES}
  ${CMAKE_SOURCE_DIR}/libgnucash/backend/xml/io-example-account.cpp
  ${CMAKE_SOURCE_DIR}/libgnucash/backend/xml/io-gncxml-gen.cpp
@@ -56,53 +56,53 @@ SET(test_backend_xml_module_SOURCES
  ${CMAKE_SOURCE_DIR}/libgnucash/backend/xml/gnc-pricedb-xml-v2.cpp
 )

-SET_LOCAL_DIST(test_backend_xml_DIST_local CMakeLists.txt grab-types.pl
+set_local_dist(test_backend_xml_DIST_local CMakeLists.txt grab-types.pl
  README test-date-converting.cpp test-dom-converters1.cpp
  test-dom-parser1.cpp test-file-stuff.cpp test-file-stuff.h test-kvp-frames.cpp
  test-load-backend.cpp test-load-example-account.cpp  test-load-xml2.cpp
  test-save-in-lang.cpp test-string-converters.cpp test-xml2-is-file.cpp
  test-xml-account.cpp test-real-data.sh test-xml-commodity.cpp
  test-xml-pricedb.cpp test-xml-transaction.cpp)
-SET(test_backend_xml_DIST ${test_backend_xml_DIST_local} ${test_backend_xml_test_files_DIST} PARENT_SCOPE)
+set(test_backend_xml_DIST ${test_backend_xml_DIST_local} ${test_backend_xml_test_files_DIST} PARENT_SCOPE)

-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
+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
 )
 # FIXME Why is this test not run/running ?
-#ADD_XML_TEST(test-save-in-lang test-save-in-lang.cpp
+#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
+gnc_add_test_with_guile(test-load-example-account
  "${test_backend_xml_module_SOURCES};test-load-example-account.cpp"
  XML_TEST_INCLUDE_DIRS XML_TEST_LIBS
  GNC_ACCOUNT_PATH=${CMAKE_SOURCE_DIR}/data/accounts/C
 )
-TARGET_COMPILE_OPTIONS(test-load-example-account PRIVATE -DU_SHOW_CPLUSPLUS_API=0)
-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"
+target_compile_options(test-load-example-account PRIVATE -DU_SHOW_CPLUSPLUS_API=0)
+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 "")
-IF (${CMAKE_VERSION} VERSION_GREATER 3.1)
-  SET(CMAKE_COMMAND_TMP ${CMAKE_COMMAND} -E env)
-ENDIF()
+set(CMAKE_COMMAND_TMP "")
+if (${CMAKE_VERSION} VERSION_GREATER 3.1)
+  set(CMAKE_COMMAND_TMP ${CMAKE_COMMAND} -E env)
+endif()

-SET(test-real-data-env
+set(test-real-data-env
  SRCDIR=${CMAKE_CURRENT_SOURCE_DIR}
  VERBOSE=yes
  TEST_PATH=${CMAKE_BINARY_DIR}/bin
 )
-ADD_TEST(NAME test-real-data
+add_test(NAME test-real-data
   COMMAND ${CMAKE_COMMAND_TMP}
    ${SHELL} ${CMAKE_CURRENT_SOURCE_DIR}/test-real-data.sh
 )
-SET_TESTS_PROPERTIES(test-real-data PROPERTIES ENVIRONMENT "${test-real-data-env}")
+set_tests_properties(test-real-data PROPERTIES ENVIRONMENT "${test-real-data-env}")
--- a/libgnucash/backend/xml/test/test-files/CMakeLists.txt
+++ b/libgnucash/backend/xml/test/test-files/CMakeLists.txt
@@ -1,6 +1,6 @@

-ADD_SUBDIRECTORY(xml2)
+add_subdirectory(xml2)

-SET_LOCAL_DIST(test_backend_xml_test_files_DIST_local CMakeLists.txt )
-SET(test_backend_xml_test_files_DIST ${test_backend_xml_test_files_DIST_local} ${xml2_DIST} PARENT_SCOPE)
+set_local_dist(test_backend_xml_test_files_DIST_local CMakeLists.txt )
+set(test_backend_xml_test_files_DIST ${test_backend_xml_test_files_DIST_local} ${xml2_DIST} PARENT_SCOPE)

--- a/libgnucash/backend/xml/test/test-files/xml2/CMakeLists.txt
+++ b/libgnucash/backend/xml/test/test-files/xml2/CMakeLists.txt
@@ -1,4 +1,4 @@

-SET_DIST_LIST(xml2_DIST abcall.gml2 abc.gml2 carols-data-file.gml2 cbb-export.gml2 CMakeLists.txt conrads-file.gml2
+set_dist_list(xml2_DIST abcall.gml2 abc.gml2 carols-data-file.gml2 cbb-export.gml2 CMakeLists.txt conrads-file.gml2
        every.gml2 goonies-file.gml2 hierachical-data-file.gml2 Money95bank_fr.gml2
        Money95invst.gml2 Money95mutual.gml2 Money95stocks.gml2 ms-money.gml2 pricedb1.gml2)