diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/test/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | data/test/Makefile.am | 2 | ||||
| -rw-r--r-- | data/test/dir2/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | data/test/dir2/Makefile.am | 9 | ||||
| -rw-r--r-- | data/test/dir2/file1.txt | 1 | ||||
| -rw-r--r-- | data/test/dir2/file2.txt | 1 |
6 files changed, 19 insertions, 2 deletions
diff --git a/data/test/CMakeLists.txt b/data/test/CMakeLists.txt index 11d0b5b61..2141da3cc 100644 --- a/data/test/CMakeLists.txt +++ b/data/test/CMakeLists.txt @@ -21,4 +21,4 @@ SET(FILES INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/test) -ADD_SUBDIRECTORY(dir1) +ADD_SUBDIRECTORY(dir1 dir2) diff --git a/data/test/Makefile.am b/data/test/Makefile.am index 2f7b7f0dd..3d4fa7f8e 100644 --- a/data/test/Makefile.am +++ b/data/test/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = dir1 +SUBDIRS = dir1 dir2 testdir = $(pkgdatadir)/data/test diff --git a/data/test/dir2/CMakeLists.txt b/data/test/dir2/CMakeLists.txt new file mode 100644 index 000000000..60f5429ec --- /dev/null +++ b/data/test/dir2/CMakeLists.txt @@ -0,0 +1,6 @@ +SET(FILES + file1.txt + file2.txt + ) + +INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/test/dir2) diff --git a/data/test/dir2/Makefile.am b/data/test/dir2/Makefile.am new file mode 100644 index 000000000..17934f3df --- /dev/null +++ b/data/test/dir2/Makefile.am @@ -0,0 +1,9 @@ +dir2dir = $(pkgdatadir)/data/test/dir2 + +dir2_DATA = \ + file1.txt \ + file2.txt + +EXTRA_DIST = \ + $(dir2_DATA) \ + CMakeLists.txt diff --git a/data/test/dir2/file1.txt b/data/test/dir2/file1.txt new file mode 100644 index 000000000..7d4116bf2 --- /dev/null +++ b/data/test/dir2/file1.txt @@ -0,0 +1 @@ +file1 test line 1 diff --git a/data/test/dir2/file2.txt b/data/test/dir2/file2.txt new file mode 100644 index 000000000..aff8265a1 --- /dev/null +++ b/data/test/dir2/file2.txt @@ -0,0 +1 @@ +file2 test line 1 |