Skip to content

Commit 61f60e4

Browse files
committedAug 12, 2015
Fix some warnings on OSX build
1 parent a477b3a commit 61f60e4

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed
 

‎ci/travis/before_install-osx.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
brew tap osgeo/osgeo4mac
22
brew update
33
brew install osgeo/osgeo4mac/qgis-28 --only-dependencies
4-
brew install doxygen
54

65
brew ln bison --force
76
brew ln sqlite --force
@@ -10,6 +9,3 @@ brew ln expat --force
109
brew ln libxml2 --force
1110
brew ln gettext --force
1211
brew ln libffi --force
13-
14-
export HOMEBREW_PREFIX=`brew --prefix`
15-
export PATH=${PATH}:${HOMEBREW_PREFIX}/bin:${HOMEBREW_PREFIX}/sbin:/usr/bin:/bin:/usr/sbin:/sbin:/opt/X11/bin:/usr/X11/bin

‎ci/travis/install-osx.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
mkdir build
22
cd build
33
#no PGTEST for OSX - can't get postgres to start with brew install
4+
#no APIDOC for OSX - doxygen tests and warnings are covered by linux build
5+
#no deprecated-declarations warnings... requires QGIS ported to Cocoa
46
cmake -DWITH_SERVER=ON -DWITH_STAGED_PLUGINS=OFF -DWITH_GRASS=OFF \
57
-DSUPPRESS_QT_WARNINGS=ON -DENABLE_MODELTEST=ON -DENABLE_PGTEST=OFF \
6-
-DWITH_QWTPOLAR=OFF -DWITH_APIDOC=ON -DWITH_PYSPATIALITE=ON \
8+
-DWITH_QWTPOLAR=OFF -DWITH_PYSPATIALITE=ON \
79
-DQWT_INCLUDE_DIR=/usr/local/opt/qwt/lib/qwt.framework/Headers/ \
8-
-DQWT_LIBRARY=/usr/local/opt/qwt/lib/qwt.framework/qwt ..
10+
-DQWT_LIBRARY=/usr/local/opt/qwt/lib/qwt.framework/qwt \
11+
-DCMAKE_CXX_FLAGS="-Wno-deprecated-declarations" ..

‎src/app/main.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -404,6 +404,7 @@ APP_EXPORT int main( int argc, char *argv[] )
404404
.arg( rescLimit.rlim_cur ).arg( rescLimit.rlim_max ) );
405405
}
406406
}
407+
Q_UNUSED( oldSoft ); //avoid warnings
407408
QgsDebugMsg( QString( "Mac RLIMIT_NOFILE Soft/Hard ORIG: %1 / %2" )
408409
.arg( oldSoft ).arg( oldHard ) );
409410
}

‎src/core/pal/feature.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ namespace pal
7979
, mObstacleFactor( 1.0 )
8080
, mPriority( -1.0 )
8181
{
82-
assert( finite( lx ) && finite( ly ) );
82+
assert( qIsFinite( lx ) && qIsFinite( ly ) );
8383
}
8484

8585
Feature::~Feature()

0 commit comments

Comments
 (0)
Please sign in to comment.