diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2019-12-20 12:34:09 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2019-12-20 12:34:09 +0100 |
| commit | 34337559cd189b392ddccd5c166cc1019e2ea9dd (patch) | |
| tree | 161f289ca2958dd637727fe8131b59f47252129e | |
| parent | 652a1cd16895cbe1c7b2ea07619c463aac1fe752 (diff) | |
| download | PROJ-data-34337559cd189b392ddccd5c166cc1019e2ea9dd.tar.gz PROJ-data-34337559cd189b392ddccd5c166cc1019e2ea9dd.zip | |
CMakeLists.txt: fix CPACK_SOURCE_IGNORE_FILES that causes files containing 'sh' in the middle to be ignored
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | travis/expected_main.lst | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 000ecaa..b5ce1eb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,9 +2,6 @@ cmake_minimum_required(VERSION 2.6) -# Keep msvc quiet -add_definitions( "/D_CRT_SECURE_NO_WARNINGS" ) - project(PROJ_DATUMGRID_GEOTIFF) set(PROJ_DATUMGRID_GEOTIFF_VERSION_MAJOR 1) set(PROJ_DATUMGRID_GEOTIFF_VERSION_MINOR 0) @@ -12,7 +9,7 @@ set(PROJ_DATUMGRID_GEOTIFF_VERSION_MINOR 0) set(CPACK_SOURCE_GENERATOR "TGZ;ZIP") set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 0) set(CPACK_SOURCE_PACKAGE_FILE_NAME "proj-datumgrid-geotiff-${PROJ_DATUMGRID_GEOTIFF_VERSION_MAJOR}.${PROJ_DATUMGRID_GEOTIFF_VERSION_MINOR}") -set(CPACK_SOURCE_IGNORE_FILES "/travis/;/.github/;/.git/;.swp$;.*~;.*.py;.*.sh;/scripts/;.*.csv;${CPACK_SOURCE_IGNORE_FILES}") +set(CPACK_SOURCE_IGNORE_FILES "/travis/;/.github/;/.git/;.swp$;.*~;.py$;.sh$;/scripts/;.csv$;${CPACK_SOURCE_IGNORE_FILES}") set(CPACK_INSTALL_COMMANDS "${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/tmp" "${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/README.DATUMGRID ${CMAKE_BINARY_DIR}/tmp" diff --git a/travis/expected_main.lst b/travis/expected_main.lst index 248f9a4..bb0c879 100644 --- a/travis/expected_main.lst +++ b/travis/expected_main.lst @@ -31,6 +31,7 @@ conus.tif CQ77SCRS.tif CRD27_00.tif CRD93_00.tif +cshpgn.tif D73_ETRS89_geo.tif DK DK_bornholm.pol @@ -46,6 +47,7 @@ dvr90.tif egm08_25.tif egm96_15.tif emhpgn.tif +eshpgn.tif ethpgn.tif flhpgn.tif FL.tif @@ -143,6 +145,7 @@ inhpgn.tif ISL ISN2004_ISN2016.tif ISN93_ISN2016.tif +kshpgn.tif kyhpgn.tif lahpgn.tif lyttht1937-nzvd2016.tif @@ -154,6 +157,7 @@ mihpgn.tif mnhpgn.tif mohpgn.tif motuht1953-nzvd2016.tif +mshpgn.tif NA27SCRS.tif NA83SCRS.tif napiht1962-nzvd2016.tif @@ -250,6 +254,7 @@ WI.tif wmhpgn.tif wohpgn.tif WO.tif +wshpgn.tif wthpgn.tif wvhpgn.tif wyhpgn.tif |