gnucash unstable: Prevent installation of cmake related files when building in source

Geert Janssens gjanssens at code.gnucash.org
Sun Feb 4 04:37:33 EST 2018


Updated	 via  https://github.com/Gnucash/gnucash/commit/a3a42d29 (commit)
	from  https://github.com/Gnucash/gnucash/commit/9e5a4810 (commit)



commit a3a42d29ee8c642761b2fbe610aba50f45bc349a
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Sat Feb 3 17:56:15 2018 +0100

    Prevent installation of cmake related files when building in source
    
    These files are part of the build system, they should not show up in the installation prefix

diff --git a/data/pixmaps/CMakeLists.txt b/data/pixmaps/CMakeLists.txt
index 764536d..884ee14 100644
--- a/data/pixmaps/CMakeLists.txt
+++ b/data/pixmaps/CMakeLists.txt
@@ -1,13 +1,17 @@
 
 INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash
-        PATTERN Makefile.* EXCLUDE
-        PATTERN CMakeLists.txt EXCLUDE
-        PATTERN hicolor EXCLUDE
+    PATTERN Makefile.* EXCLUDE
+    PATTERN CMake* EXCLUDE
+    PATTERN CTest* EXCLUDE
+    PATTERN cmake* EXCLUDE
+    PATTERN hicolor EXCLUDE
 )
 FILE(COPY ${CMAKE_CURRENT_SOURCE_DIR}
     DESTINATION ${DATADIR_BUILD}/gnucash
     PATTERN Makefile.* EXCLUDE
-    PATTERN CMakeLists.txt EXCLUDE
+    PATTERN CMake* EXCLUDE
+    PATTERN CTest* EXCLUDE
+    PATTERN cmake* EXCLUDE
     PATTERN hicolor EXCLUDE
 )
 INSTALL(
diff --git a/gnucash/gnome-utils/gtkbuilder/CMakeLists.txt b/gnucash/gnome-utils/gtkbuilder/CMakeLists.txt
index 5940e4d..01d7592 100644
--- a/gnucash/gnome-utils/gtkbuilder/CMakeLists.txt
+++ b/gnucash/gnome-utils/gtkbuilder/CMakeLists.txt
@@ -1,12 +1,16 @@
 FILE(COPY .
-  DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder
-  PATTERN Makefile.* EXCLUDE
-  PATTERN CMakeLists.txt EXCLUDE)
+    DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder
+    PATTERN Makefile.* EXCLUDE
+    PATTERN CMake* EXCLUDE
+    PATTERN CTest* EXCLUDE
+    PATTERN cmake* EXCLUDE)
 
 INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     DESTINATION share/gnucash
     PATTERN Makefile.* EXCLUDE
-    PATTERN CMakeLists.txt EXCLUDE)
+    PATTERN CMake* EXCLUDE
+    PATTERN CTest* EXCLUDE
+    PATTERN cmake* EXCLUDE)
 
 SET(gnome_utils_GLADE
         assistant-xml-encoding.glade
@@ -29,4 +33,4 @@ SET(gnome_utils_GLADE
         gnc-tree-view-owner.glade
 )
 
-SET_DIST_LIST(gnome_utils_gtkbuilder_DIST CMakeLists.txt ${gnome_utils_GLADE})
\ No newline at end of file
+SET_DIST_LIST(gnome_utils_gtkbuilder_DIST CMakeLists.txt ${gnome_utils_GLADE})
diff --git a/gnucash/gnome-utils/ui/CMakeLists.txt b/gnucash/gnome-utils/ui/CMakeLists.txt
index ce5dc73..79e28cd 100644
--- a/gnucash/gnome-utils/ui/CMakeLists.txt
+++ b/gnucash/gnome-utils/ui/CMakeLists.txt
@@ -1,12 +1,16 @@
 FILE(COPY .
-  DESTINATION ${DATADIR_BUILD}/gnucash/ui
-  PATTERN Makefile.* EXCLUDE
-  PATTERN CMakeLists.txt EXCLUDE)
+    DESTINATION ${DATADIR_BUILD}/gnucash/ui
+    PATTERN Makefile.* EXCLUDE
+    PATTERN CMake* EXCLUDE
+    PATTERN CTest* EXCLUDE
+    PATTERN cmake* EXCLUDE)
 
 INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     DESTINATION share/gnucash
     PATTERN Makefile.* EXCLUDE
-    PATTERN CMakeLists.txt EXCLUDE)
+    PATTERN CMake* EXCLUDE
+    PATTERN CTest* EXCLUDE
+    PATTERN cmake* EXCLUDE)
 
 SET(gnome_utils_ui_DIST_local
         CMakeLists.txt
diff --git a/gnucash/gnome/gtkbuilder/CMakeLists.txt b/gnucash/gnome/gtkbuilder/CMakeLists.txt
index bd05f1b..61f24e1 100644
--- a/gnucash/gnome/gtkbuilder/CMakeLists.txt
+++ b/gnucash/gnome/gtkbuilder/CMakeLists.txt
@@ -1,12 +1,16 @@
 FILE(COPY .
     DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder
     PATTERN Makefile.* EXCLUDE
-    PATTERN CMakeLists.txt EXCLUDE)
+    PATTERN CMake* EXCLUDE
+    PATTERN CTest* EXCLUDE
+    PATTERN cmake* EXCLUDE)
 
 INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-        DESTINATION share/gnucash
-        PATTERN Makefile.* EXCLUDE
-        PATTERN CMakeLists.txt EXCLUDE)
+    DESTINATION share/gnucash
+    PATTERN Makefile.* EXCLUDE
+    PATTERN CMake* EXCLUDE
+    PATTERN CTest* EXCLUDE
+    PATTERN cmake* EXCLUDE)
 
 SET(gnome_GLADE
         assistant-acct-period.glade
diff --git a/gnucash/gnome/ui/CMakeLists.txt b/gnucash/gnome/ui/CMakeLists.txt
index f57f91e..707ec33 100644
--- a/gnucash/gnome/ui/CMakeLists.txt
+++ b/gnucash/gnome/ui/CMakeLists.txt
@@ -1,12 +1,16 @@
 FILE(COPY .
-        DESTINATION ${DATADIR_BUILD}/gnucash/ui
-        PATTERN Makefile.* EXCLUDE
-        PATTERN CMakeLists.txt EXCLUDE)
+    DESTINATION ${DATADIR_BUILD}/gnucash/ui
+    PATTERN Makefile.* EXCLUDE
+    PATTERN CMake* EXCLUDE
+    PATTERN CTest* EXCLUDE
+    PATTERN cmake* EXCLUDE)
 
 INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     DESTINATION share/gnucash
     PATTERN Makefile.* EXCLUDE
-    PATTERN CMakeLists.txt EXCLUDE)
+    PATTERN CMake* EXCLUDE
+    PATTERN CTest* EXCLUDE
+    PATTERN cmake* EXCLUDE)
 
 SET(gnome_UI
       gnc-plugin-account-tree-ui.xml
diff --git a/gnucash/import-export/bi-import/gtkbuilder/CMakeLists.txt b/gnucash/import-export/bi-import/gtkbuilder/CMakeLists.txt
index 5940a2e..ed66128 100644
--- a/gnucash/import-export/bi-import/gtkbuilder/CMakeLists.txt
+++ b/gnucash/import-export/bi-import/gtkbuilder/CMakeLists.txt
@@ -1,13 +1,17 @@
 
 FILE(COPY .
-  DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder
-  PATTERN Makefile.* EXCLUDE
-  PATTERN CMakeLists.txt EXCLUDE)
+    DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder
+    PATTERN Makefile.* EXCLUDE
+    PATTERN CMake* EXCLUDE
+    PATTERN CTest* EXCLUDE
+    PATTERN cmake* EXCLUDE)
 
 
 INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     DESTINATION share/gnucash
     PATTERN Makefile.* EXCLUDE
-    PATTERN CMakeLists.txt EXCLUDE)
+    PATTERN CMake* EXCLUDE
+    PATTERN CTest* EXCLUDE
+    PATTERN cmake* EXCLUDE)
 
-SET_DIST_LIST(bi_import_glade_DIST CMakeLists.txt dialog-bi-import-gui.glade)
\ No newline at end of file
+SET_DIST_LIST(bi_import_glade_DIST CMakeLists.txt dialog-bi-import-gui.glade)
diff --git a/gnucash/import-export/bi-import/ui/CMakeLists.txt b/gnucash/import-export/bi-import/ui/CMakeLists.txt
index 51d6bf1..aec74fe 100644
--- a/gnucash/import-export/bi-import/ui/CMakeLists.txt
+++ b/gnucash/import-export/bi-import/ui/CMakeLists.txt
@@ -1,11 +1,15 @@
 FILE(COPY .
-  DESTINATION ${DATADIR_BUILD}/gnucash/ui
-  PATTERN Makefile.* EXCLUDE
-  PATTERN CMakeLists.txt EXCLUDE)
+    DESTINATION ${DATADIR_BUILD}/gnucash/ui
+    PATTERN Makefile.* EXCLUDE
+    PATTERN CMake* EXCLUDE
+    PATTERN CTest* EXCLUDE
+    PATTERN cmake* EXCLUDE)
 
 INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     DESTINATION share/gnucash
     PATTERN Makefile.* EXCLUDE
-    PATTERN CMakeLists.txt EXCLUDE)
+    PATTERN CMake* EXCLUDE
+    PATTERN CTest* EXCLUDE
+    PATTERN cmake* EXCLUDE)
 
 SET_DIST_LIST(bi_import_ui_DIST CMakeLists.txt gnc-plugin-bi-import-ui.xml)
diff --git a/gnucash/import-export/customer-import/gtkbuilder/CMakeLists.txt b/gnucash/import-export/customer-import/gtkbuilder/CMakeLists.txt
index 45ff778..a335722 100644
--- a/gnucash/import-export/customer-import/gtkbuilder/CMakeLists.txt
+++ b/gnucash/import-export/customer-import/gtkbuilder/CMakeLists.txt
@@ -1,11 +1,15 @@
 FILE(COPY .
-  DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder
+    DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder
     PATTERN Makefile.* EXCLUDE
-    PATTERN CMakeLists.txt EXCLUDE)
+    PATTERN CMake* EXCLUDE
+    PATTERN CTest* EXCLUDE
+    PATTERN cmake* EXCLUDE)
 
 INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     DESTINATION share/gnucash
     PATTERN Makefile.* EXCLUDE
-    PATTERN CMakeLists.txt EXCLUDE)
+    PATTERN CMake* EXCLUDE
+    PATTERN CTest* EXCLUDE
+    PATTERN cmake* EXCLUDE)
 
 SET_DIST_LIST(customer_import_glade_DIST CMakeLists.txt dialog-customer-import-gui.glade)
diff --git a/gnucash/import-export/customer-import/ui/CMakeLists.txt b/gnucash/import-export/customer-import/ui/CMakeLists.txt
index 2fad3e5..2e60fa0 100644
--- a/gnucash/import-export/customer-import/ui/CMakeLists.txt
+++ b/gnucash/import-export/customer-import/ui/CMakeLists.txt
@@ -1,11 +1,15 @@
 FILE(COPY .
-  DESTINATION ${DATADIR_BUILD}/gnucash/ui
+    DESTINATION ${DATADIR_BUILD}/gnucash/ui
     PATTERN Makefile.* EXCLUDE
-    PATTERN CMakeLists.txt EXCLUDE)
+    PATTERN CMake* EXCLUDE
+    PATTERN CTest* EXCLUDE
+    PATTERN cmake* EXCLUDE)
 
 INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     DESTINATION share/gnucash
     PATTERN Makefile.* EXCLUDE
-    PATTERN CMakeLists.txt EXCLUDE)
+    PATTERN CMake* EXCLUDE
+    PATTERN CTest* EXCLUDE
+    PATTERN cmake* EXCLUDE)
 
 SET_DIST_LIST(customer_import_ui_DIST CMakeLists.txt gnc-plugin-customer-import-ui.xml)
diff --git a/gnucash/python/CMakeLists.txt b/gnucash/python/CMakeLists.txt
index 7192038..c0e38da 100644
--- a/gnucash/python/CMakeLists.txt
+++ b/gnucash/python/CMakeLists.txt
@@ -19,11 +19,19 @@ ENDIF()
     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
   )
 
-  INSTALL(DIRECTORY pycons DESTINATION  ${CMAKE_INSTALL_DATADIR}/gnucash/python)
+  INSTALL(DIRECTORY pycons DESTINATION  ${CMAKE_INSTALL_DATADIR}/gnucash/python
+    PATTERN Makefile.* EXCLUDE
+    PATTERN CMake* EXCLUDE
+    PATTERN CTest* EXCLUDE
+    PATTERN cmake* EXCLUDE)
   INSTALL(FILES init.py DESTINATION  ${CMAKE_INSTALL_DATADIR}/gnucash/python)
 
+  FILE(COPY pycons DESTINATION ${CMAKE_BINARY_DIR}/share/gnucash/python
+    PATTERN Makefile.* EXCLUDE
+    PATTERN CMake* EXCLUDE
+    PATTERN CTest* EXCLUDE
+    PATTERN cmake* EXCLUDE)
   FILE(COPY init.py DESTINATION ${CMAKE_BINARY_DIR}/share/gnucash/python)
-  FILE(COPY pycons DESTINATION ${CMAKE_BINARY_DIR}/share/gnucash/python)
 ENDIF(WITH_PYTHON)
 
 SET_LOCAL_DIST(python_DIST_local CMakeLists.txt gncmod-python.c init.py)



Summary of changes:
 data/pixmaps/CMakeLists.txt                                | 12 ++++++++----
 gnucash/gnome-utils/gtkbuilder/CMakeLists.txt              | 14 +++++++++-----
 gnucash/gnome-utils/ui/CMakeLists.txt                      | 12 ++++++++----
 gnucash/gnome/gtkbuilder/CMakeLists.txt                    | 12 ++++++++----
 gnucash/gnome/ui/CMakeLists.txt                            | 12 ++++++++----
 gnucash/import-export/bi-import/gtkbuilder/CMakeLists.txt  | 14 +++++++++-----
 gnucash/import-export/bi-import/ui/CMakeLists.txt          | 12 ++++++++----
 .../customer-import/gtkbuilder/CMakeLists.txt              | 10 +++++++---
 gnucash/import-export/customer-import/ui/CMakeLists.txt    | 10 +++++++---
 gnucash/python/CMakeLists.txt                              | 12 ++++++++++--
 10 files changed, 82 insertions(+), 38 deletions(-)



More information about the gnucash-changes mailing list