From 9b0a98383a1d8c676760ebf3d69c2c093187719a Mon Sep 17 00:00:00 2001 From: Ward Fisher Date: Thu, 6 Feb 2014 10:53:47 -0700 Subject: [PATCH] Added CMakeLists.txt to missing Makefile.am files, so that CMake-based builds can be used on source packages generated by make dist --- ncdap_test/CMakeLists.txt | 2 +- ncdap_test/expected3/Makefile.am | 3 ++- ncdap_test/expected4/Makefile.am | 2 +- ncdap_test/expectremote3/Makefile.am | 3 ++- ncdap_test/expectremote4/Makefile.am | 3 ++- ncdap_test/expecttds3/Makefile.am | 3 ++- ncdap_test/nocacheremote3/Makefile.am | 3 ++- ncdap_test/nocacheremote4/Makefile.am | 3 ++- ncdap_test/testdata3/Makefile.am | 3 ++- ncdump/cdl4/Makefile.am | 3 ++- ncdump/expected4/Makefile.am | 3 ++- 11 files changed, 20 insertions(+), 11 deletions(-) diff --git a/ncdap_test/CMakeLists.txt b/ncdap_test/CMakeLists.txt index f538c869d..1dbe9e6dd 100644 --- a/ncdap_test/CMakeLists.txt +++ b/ncdap_test/CMakeLists.txt @@ -53,7 +53,7 @@ ADD_SUBDIRECTORY(expectremote4) ADD_SUBDIRECTORY(expecttds3) ADD_SUBDIRECTORY(nocacheremote3) ADD_SUBDIRECTORY(nocacheremote4) -ADD_SUBDIRECTORY(special3) +#ADD_SUBDIRECTORY(special3) ADD_SUBDIRECTORY(testdata3) diff --git a/ncdap_test/expected3/Makefile.am b/ncdap_test/expected3/Makefile.am index 109166dcb..c70d17eee 100644 --- a/ncdap_test/expected3/Makefile.am +++ b/ncdap_test/expected3/Makefile.am @@ -33,6 +33,7 @@ test.sds1.dmp test.sds2.dmp test.sds3.dmp \ test.sds4.dmp test.sds5.dmp test.sds6.dmp \ test.sds7.dmp test.vs1.dmp test.vs2.dmp \ test.vs3.dmp test.vs4.dmp test.vs5.dmp \ -text.nc.dmp whoi.dmp +text.nc.dmp whoi.dmp \ +CMakeLists.txt diff --git a/ncdap_test/expected4/Makefile.am b/ncdap_test/expected4/Makefile.am index ac80e3d15..afb439124 100644 --- a/ncdap_test/expected4/Makefile.am +++ b/ncdap_test/expected4/Makefile.am @@ -32,4 +32,4 @@ test.sds2.dmp test.sds3.dmp test.sds4.dmp \ test.sds5.dmp test.sds6.dmp test.sds7.dmp \ test.vs1.dmp test.vs2.dmp test.vs3.dmp \ test.vs4.dmp test.vs5.dmp text.nc.dmp \ -whoi.dmp +whoi.dmp CMakeLists.txt diff --git a/ncdap_test/expectremote3/Makefile.am b/ncdap_test/expectremote3/Makefile.am index a9131b1dc..4c562e7ff 100644 --- a/ncdap_test/expectremote3/Makefile.am +++ b/ncdap_test/expectremote3/Makefile.am @@ -28,4 +28,5 @@ test.sds4.dmp test.sds5.dmp test.vs1.dmp \ test.vs2.dmp test.vs3.dmp test.vs4.dmp \ test.vs5.dmp whoi.dmp \ GLOBEC_cetaceans.1.dmp GLOBEC_cetaceans.2.dmp \ -Surface_METAR_20120101_0000.nc.1.dmp +Surface_METAR_20120101_0000.nc.1.dmp \ +CMakeLists.txt diff --git a/ncdap_test/expectremote4/Makefile.am b/ncdap_test/expectremote4/Makefile.am index 51ebf906e..2053ff5ba 100644 --- a/ncdap_test/expectremote4/Makefile.am +++ b/ncdap_test/expectremote4/Makefile.am @@ -27,4 +27,5 @@ test.sds2.dmp test.sds3.dmp test.sds4.dmp \ test.sds5.dmp test.vs1.dmp test.vs2.dmp \ test.vs3.dmp test.vs4.dmp test.vs5.dmp \ whoi.dmp \ -GLOBEC_cetaceans.1.dmp GLOBEC_cetaceans.2.dmp +GLOBEC_cetaceans.1.dmp GLOBEC_cetaceans.2.dmp \ +CMakeLists.txt diff --git a/ncdap_test/expecttds3/Makefile.am b/ncdap_test/expecttds3/Makefile.am index 5b6b9d079..f9a190a6f 100644 --- a/ncdap_test/expecttds3/Makefile.am +++ b/ncdap_test/expecttds3/Makefile.am @@ -19,4 +19,5 @@ tst-PROFILER_RASS.nc.dmp \ tst-RUC.nc.dmp \ tst-sst.nc.dmp \ tst-striped.nc.dmp \ -tst-upc-nmm-point.nc.dmp +tst-upc-nmm-point.nc.dmp \ +CMakeLists.txt diff --git a/ncdap_test/nocacheremote3/Makefile.am b/ncdap_test/nocacheremote3/Makefile.am index 167a0b5d5..a9c963bae 100644 --- a/ncdap_test/nocacheremote3/Makefile.am +++ b/ncdap_test/nocacheremote3/Makefile.am @@ -40,4 +40,5 @@ test.06.1.dmp \ test.07.1.dmp \ test.07.2.dmp \ test.07.3.dmp \ -test.07.4.dmp +test.07.4.dmp \ +CMakeLists.txt diff --git a/ncdap_test/nocacheremote4/Makefile.am b/ncdap_test/nocacheremote4/Makefile.am index 204b82411..a88073557 100644 --- a/ncdap_test/nocacheremote4/Makefile.am +++ b/ncdap_test/nocacheremote4/Makefile.am @@ -40,4 +40,5 @@ test.06.1.dmp \ test.07.1.dmp \ test.07.2.dmp \ test.07.3.dmp \ -test.07.4.dmp +test.07.4.dmp \ +CMakeLists.txt diff --git a/ncdap_test/testdata3/Makefile.am b/ncdap_test/testdata3/Makefile.am index db9d407f4..3b70c64e2 100755 --- a/ncdap_test/testdata3/Makefile.am +++ b/ncdap_test/testdata3/Makefile.am @@ -94,4 +94,5 @@ test.vs3.das test.vs3.dds test.vs3.dods \ test.vs4.das test.vs4.dds test.vs4.dods \ test.vs5.das test.vs5.dds test.vs5.dods \ text.nc.das text.nc.dds text.nc.dods \ -whoi.das whoi.dds whoi.dods +whoi.das whoi.dds whoi.dods \ +CMakeLists.txt diff --git a/ncdump/cdl4/Makefile.am b/ncdump/cdl4/Makefile.am index 6a8406bb2..6801178f9 100644 --- a/ncdump/cdl4/Makefile.am +++ b/ncdump/cdl4/Makefile.am @@ -23,6 +23,7 @@ ref_solar.cdl unlimtest1.cdl unlimtest2.cdl \ ref_tst_opaque_data.cdl \ ref_tst_vlen_data.cdl ref_tst_vlen_data2.cdl \ ref_niltest.cdl ref_tst_h_scalar.cdl ref_tst_econst.cdl \ -ref_tst_nul3.cdl ref_tst_nul4.cdl ref_tst_names.cdl +ref_tst_nul3.cdl ref_tst_nul4.cdl ref_tst_names.cdl \ +CMakeLists.txt diff --git a/ncdump/expected4/Makefile.am b/ncdump/expected4/Makefile.am index abafb23b4..310c49f63 100644 --- a/ncdump/expected4/Makefile.am +++ b/ncdump/expected4/Makefile.am @@ -21,7 +21,8 @@ n3time.dmp ref_tst_special_atts3.dmp ref_tst_chardata.dmp ref_tst_unlim2.dmp \ ref_solar.dmp unlimtest1.dmp unlimtest2.dmp \ ref_tst_vlen_data.dmp ref_tst_vlen_data2.dmp \ ref_niltest.dmp ref_tst_h_scalar.dmp ref_tst_econst.dmp \ -ref_tst_nul3.dmp ref_tst_nul4.dmp ref_tst_names.dmp +ref_tst_nul3.dmp ref_tst_nul4.dmp ref_tst_names.dmp \ +CMakeLists.txt # These do not exist because they are not run as usual tests # bigf1.dmp bigf2.dmp bigf3.dmp bigr1.dmp bigr2.dmp bigr3.dmp gfs1.dmp