From 0ecafc93edc51e9a9868db2e97f93b7b4738e7a3 Mon Sep 17 00:00:00 2001 From: John Ralls Date: Sat, 29 Apr 2023 13:28:09 -0700 Subject: [PATCH] Correct CMake distribution. Remove deleted gnc-fq-helper.1 and gnc-fq-dump.1 doc dependencies. Add csv-exp/test to Dist. add csv-exp/test --- doc/CMakeLists.txt | 2 +- gnucash/import-export/csv-exp/CMakeLists.txt | 13 +++++++++++-- gnucash/import-export/csv-exp/test/CMakeLists.txt | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 0e94235165..82dd989cbe 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -5,7 +5,7 @@ set(doc_DATA ) set(doc_noinst_DATA - CMakeLists.txt gnc-fq-dump.1 gnc-fq-helper.1 gnucash.1.in + CMakeLists.txt gnucash.1.in gnucash-cli.1.in tip_of_the_day.list.c README.txt) install(FILES ${doc_DATA} DESTINATION ${CMAKE_INSTALL_DOCDIR}) diff --git a/gnucash/import-export/csv-exp/CMakeLists.txt b/gnucash/import-export/csv-exp/CMakeLists.txt index 190f0c2b24..d413a74569 100644 --- a/gnucash/import-export/csv-exp/CMakeLists.txt +++ b/gnucash/import-export/csv-exp/CMakeLists.txt @@ -49,5 +49,14 @@ install(TARGETS gnc-csv-export RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) # No headers to install. -set_dist_list (csv_export_DIST CMakeLists.txt - ${csv_export_SOURCES} ${csv_export_noinst_HEADERS}) +set_local_dist (csv_export_DIST_local + CMakeLists.txt + ${csv_export_SOURCES} + ${csv_export_noinst_HEADERS} +) + +set (csv_export_DIST + ${csv_export_DIST_local} + ${test_csv_export_DIST} + PARENT_SCOPE +) diff --git a/gnucash/import-export/csv-exp/test/CMakeLists.txt b/gnucash/import-export/csv-exp/test/CMakeLists.txt index 6689091025..d6c0d7f515 100644 --- a/gnucash/import-export/csv-exp/test/CMakeLists.txt +++ b/gnucash/import-export/csv-exp/test/CMakeLists.txt @@ -19,7 +19,7 @@ gnc_add_test (test-csv-export-helpers test-csv-export-helpers_LIBS ) -set_dist_list (test-csv-export_DIST +set_dist_list (test_csv_export_DIST CMakeLists.txt ${test-csv-export-helpers_SOURCES} )