Merge pull request #121 from rouault/travis_remove_osx

.travis.yml: remove OSX

Author: rouault

.travis.yml

@@ -10,21 +10,22 @@ matrix:
       env:
         - BUILD_NAME=linux
 
-    - os: osx
-      osx_image: xcode14.2
-      compiler: clang
-      cache:
-        apt: true
-        directories:
-          - $HOME/.ccache
-      env:
-        - BUILD_NAME=osx
-        - CC=clang
-        - CXX=clang++
-      addons:
-        homebrew:
-            packages:
-            - ccache
+    # Causes "Owner OSGeo does not have enough credits" since we downgraded our Travis plan
+    #- os: osx
+    #  osx_image: xcode14.2
+    #  compiler: clang
+    #  cache:
+    #    apt: true
+    #    directories:
+    #      - $HOME/.ccache
+    #  env:
+    #    - BUILD_NAME=osx
+    #    - CC=clang
+    #    - CXX=clang++
+    #  addons:
+    #    homebrew:
+    #        packages:
+    #        - ccache
 
 cache:
     directories:
@@ -39,11 +40,11 @@ install:
   - export CC="ccache $CC"
   - export CXX="ccache $CXX"
   - $CC --version
-  - (cd proj && cmake . -DBUILD_APPS=OFF -DPROJ_TESTS=OFF && make -j3 && sudo make install && (if test "$TRAVIS_OS_NAME" = "linux"; then sudo ldconfig; fi))
+  - (cd proj && cmake . -DBUILD_APPS=OFF -DBUILD_TESTING=OFF && make -j3 && sudo make install && (if test "$TRAVIS_OS_NAME" = "linux"; then sudo ldconfig; fi))
   - cd libgeotiff
   - ./autogen.sh
   - ./configure
-  - make dist
+  - make distcheck
   - mkdir libgeotiff
   - cat libgeotiff*.tar.gz | tar xz -C libgeotiff --strip-components=1
   - cd libgeotiff

libgeotiff/cmake/Makefile.am

@@ -1,5 +1,4 @@
-EXTRA_DIST  = 	FindGeoTIFF.cmake \
-		FindPROJ.cmake  \
+EXTRA_DIST  = 	FindPROJ.cmake  \
 		geo_config.h.in \
 		project-config-version.cmake.in \
 		project-config.cmake.in \