Fix some warnings on OSX build

qgis · Aug 12, 2015 · 61f60e4 · 61f60e4
1 parent a477b3a
commit 61f60e4
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/ci/travis/before_install-osx.sh b/ci/travis/before_install-osx.sh
@@ -1,7 +1,6 @@
 brew tap osgeo/osgeo4mac
 brew update
 brew install osgeo/osgeo4mac/qgis-28 --only-dependencies
-brew install doxygen
 
 brew ln bison --force
 brew ln sqlite --force
@@ -10,6 +9,3 @@ brew ln expat --force
 brew ln libxml2 --force
 brew ln gettext --force
 brew ln libffi --force
-
-export HOMEBREW_PREFIX=`brew --prefix`
-export PATH=${PATH}:${HOMEBREW_PREFIX}/bin:${HOMEBREW_PREFIX}/sbin:/usr/bin:/bin:/usr/sbin:/sbin:/opt/X11/bin:/usr/X11/bin
diff --git a/ci/travis/install-osx.sh b/ci/travis/install-osx.sh
@@ -1,8 +1,11 @@
 mkdir build
 cd build
 #no PGTEST for OSX - can't get postgres to start with brew install
+#no APIDOC for OSX - doxygen tests and warnings are covered by linux build
+#no deprecated-declarations warnings... requires QGIS ported to Cocoa
 cmake -DWITH_SERVER=ON -DWITH_STAGED_PLUGINS=OFF -DWITH_GRASS=OFF \
           -DSUPPRESS_QT_WARNINGS=ON -DENABLE_MODELTEST=ON -DENABLE_PGTEST=OFF \
-          -DWITH_QWTPOLAR=OFF -DWITH_APIDOC=ON -DWITH_PYSPATIALITE=ON \
+          -DWITH_QWTPOLAR=OFF -DWITH_PYSPATIALITE=ON \
           -DQWT_INCLUDE_DIR=/usr/local/opt/qwt/lib/qwt.framework/Headers/ \
-          -DQWT_LIBRARY=/usr/local/opt/qwt/lib/qwt.framework/qwt ..
+          -DQWT_LIBRARY=/usr/local/opt/qwt/lib/qwt.framework/qwt \
+          -DCMAKE_CXX_FLAGS="-Wno-deprecated-declarations" ..
diff --git a/src/app/main.cpp b/src/app/main.cpp
@@ -404,6 +404,7 @@ APP_EXPORT int main( int argc, char *argv[] )
                      .arg( rescLimit.rlim_cur ).arg( rescLimit.rlim_max ) );
       }
     }
+    Q_UNUSED( oldSoft ); //avoid warnings
     QgsDebugMsg( QString( "Mac RLIMIT_NOFILE Soft/Hard ORIG: %1 / %2" )
                  .arg( oldSoft ).arg( oldHard ) );
   }

diff --git a/src/core/pal/feature.cpp b/src/core/pal/feature.cpp
@@ -79,7 +79,7 @@ namespace pal
       , mObstacleFactor( 1.0 )
       , mPriority( -1.0 )
   {
-    assert( finite( lx ) && finite( ly ) );
+    assert( qIsFinite( lx ) && qIsFinite( ly ) );
   }
 
   Feature::~Feature()